From e23b176f3e103fef0f9dffa4b20ae19f48101001 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Wed, 28 Nov 2007 09:10:41 -0600
Subject: 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>
---
 makechrootpkg |  4 ++--
 mkarchroot    | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/makechrootpkg b/makechrootpkg
index 4c26673..1434d2d 100755
--- a/makechrootpkg
+++ b/makechrootpkg
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # 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
 # the Free Software Foundation; version 2 of the License.
@@ -76,7 +76,7 @@ fi
 [ -d "$chrootdir/rw" ] || mkdir "$chrootdir/rw"
 [ -d "$chrootdir/union" ] || mkdir "$chrootdir/union"
 
-function cleanup ()
+cleanup ()
 {
     echo "cleaning up unioned mounts"
     umount "$chrootdir/union"
diff --git a/mkarchroot b/mkarchroot
index 4f3abf8..2bb3413 100755
--- a/mkarchroot
+++ b/mkarchroot
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # 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
 # the Free Software Foundation; version 2 of the License.
@@ -48,7 +48,7 @@ fi
 
 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"
     usage 1
 elif [ $# -lt 1 ]; then
@@ -63,7 +63,7 @@ shift 1
 
 # {{{ functions 
 
-function chroot_mount ()
+chroot_mount ()
 {
     echo "mounting sysfs : /sys"
     [ -e "${working_dir}/sys" ] || mkdir "${working_dir}/sys"
@@ -87,7 +87,7 @@ function chroot_mount ()
     trap 'chroot_umount' 0 1 2 15
 }
 
-function chroot_umount ()
+chroot_umount ()
 {
     echo "cleaning up mounts"
     umount "${working_dir}/proc"
@@ -140,7 +140,7 @@ else
         for i in $@; do echo -e "\t$i"; done
 
         op="-Sy"
-        if [ "$FORCE" == "y" ]; then
+        if [ "$FORCE" = "y" ]; then
             op="${op}f"
         fi
         if ! pacman ${op} ${pacargs} $@; then
-- 
cgit v1.2.3-70-g09d2