Fix some bashisms (but change #! to /bin/bash)
We need to use bash due to the usage of arrays, but we might as well fix some bashisms that were used in the scripts anyways. Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
f92e01ed28
commit
e23b176f3e
|
@ -1,4 +1,4 @@
|
||||||
#!/bin/sh
|
#!/bin/bash
|
||||||
# This program is free software; you can redistribute it and/or modify
|
# This program is free software; you can redistribute it and/or modify
|
||||||
# it under the terms of the GNU General Public License as published by
|
# it under the terms of the GNU General Public License as published by
|
||||||
# the Free Software Foundation; version 2 of the License.
|
# the Free Software Foundation; version 2 of the License.
|
||||||
|
@ -76,7 +76,7 @@ fi
|
||||||
[ -d "$chrootdir/rw" ] || mkdir "$chrootdir/rw"
|
[ -d "$chrootdir/rw" ] || mkdir "$chrootdir/rw"
|
||||||
[ -d "$chrootdir/union" ] || mkdir "$chrootdir/union"
|
[ -d "$chrootdir/union" ] || mkdir "$chrootdir/union"
|
||||||
|
|
||||||
function cleanup ()
|
cleanup ()
|
||||||
{
|
{
|
||||||
echo "cleaning up unioned mounts"
|
echo "cleaning up unioned mounts"
|
||||||
umount "$chrootdir/union"
|
umount "$chrootdir/union"
|
||||||
|
|
10
mkarchroot
10
mkarchroot
|
@ -1,4 +1,4 @@
|
||||||
#!/bin/sh
|
#!/bin/bash
|
||||||
# This program is free software; you can redistribute it and/or modify
|
# This program is free software; you can redistribute it and/or modify
|
||||||
# it under the terms of the GNU General Public License as published by
|
# it under the terms of the GNU General Public License as published by
|
||||||
# the Free Software Foundation; version 2 of the License.
|
# the Free Software Foundation; version 2 of the License.
|
||||||
|
@ -48,7 +48,7 @@ fi
|
||||||
|
|
||||||
shift $(($OPTIND - 1))
|
shift $(($OPTIND - 1))
|
||||||
|
|
||||||
if [ "$RUN" == "" -a $# -lt 2 ]; then
|
if [ "$RUN" = "" -a $# -lt 2 ]; then
|
||||||
echo "you must specify a directory and one or more packages"
|
echo "you must specify a directory and one or more packages"
|
||||||
usage 1
|
usage 1
|
||||||
elif [ $# -lt 1 ]; then
|
elif [ $# -lt 1 ]; then
|
||||||
|
@ -63,7 +63,7 @@ shift 1
|
||||||
|
|
||||||
# {{{ functions
|
# {{{ functions
|
||||||
|
|
||||||
function chroot_mount ()
|
chroot_mount ()
|
||||||
{
|
{
|
||||||
echo "mounting sysfs : /sys"
|
echo "mounting sysfs : /sys"
|
||||||
[ -e "${working_dir}/sys" ] || mkdir "${working_dir}/sys"
|
[ -e "${working_dir}/sys" ] || mkdir "${working_dir}/sys"
|
||||||
|
@ -87,7 +87,7 @@ function chroot_mount ()
|
||||||
trap 'chroot_umount' 0 1 2 15
|
trap 'chroot_umount' 0 1 2 15
|
||||||
}
|
}
|
||||||
|
|
||||||
function chroot_umount ()
|
chroot_umount ()
|
||||||
{
|
{
|
||||||
echo "cleaning up mounts"
|
echo "cleaning up mounts"
|
||||||
umount "${working_dir}/proc"
|
umount "${working_dir}/proc"
|
||||||
|
@ -140,7 +140,7 @@ else
|
||||||
for i in $@; do echo -e "\t$i"; done
|
for i in $@; do echo -e "\t$i"; done
|
||||||
|
|
||||||
op="-Sy"
|
op="-Sy"
|
||||||
if [ "$FORCE" == "y" ]; then
|
if [ "$FORCE" = "y" ]; then
|
||||||
op="${op}f"
|
op="${op}f"
|
||||||
fi
|
fi
|
||||||
if ! pacman ${op} ${pacargs} $@; then
|
if ! pacman ${op} ${pacargs} $@; then
|
||||||
|
|
Loading…
Reference in New Issue