Fix bash shell location check

BASH is defined when you are actually using bash during configure, which
sucks because it ends up being '/bin/sh', messing up all of our scripts.
Change the name of the variable we use in configure, and also ensure we get
a full path to the executable by using AC_PATH_PROGS rather than
AC_CHECK_PROGS. Finally, change the variable name everywhere we use it.

Signed-off-by: Dan McGee <dan@archlinux.org>

configure.ac

@@ -127,7 +127,7 @@ AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_LIBTOOL
 AC_CHECK_PROGS([PYTHON], [python2.7 python2.6 python2.5 python2 python], [false])
-AC_CHECK_PROGS([BASH], [bash bash4 bash3], [false])
+AC_PATH_PROGS([BASH_SHELL], [bash bash4 bash3], [false])
 
 # find installed gettext
 AM_GNU_GETTEXT([external])

contrib/Makefile.am

@@ -29,7 +29,7 @@ MOSTLYCLEANFILES = $(OURFILES) *.tmp
 edit = sed \
 	-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
 	-e 's|@localstatedir[@]|$(localstatedir)|g' \
-	-e 's|@BASH[@]|$(BASH)|g'
+	-e 's|@BASH_SHELL[@]|$(BASH_SHELL)|g'
 
 $(OURFILES): Makefile
 	@echo '    ' GEN $@;

contrib/bacman.in

@@ -1,4 +1,4 @@
-#!@BASH@
+#!@BASH_SHELL@
 #
 #   bacman: recreate a package from a running system
 #   This script rebuilds an already installed package using metadata

contrib/pacdiff.in

@@ -1,4 +1,4 @@
-#!@BASH@
+#!@BASH_SHELL@
 #   pacdiff : a simple pacnew/pacorig/pacsave updater
 #
 #   Copyright (c) 2007 Aaron Griffin <aaronmgriffin@gmail.com>

contrib/pacscripts.in

@@ -1,4 +1,4 @@
-#!@BASH@
+#!@BASH_SHELL@
 #
 #   pacscripts : tries to print out the {pre,post}_{install,remove,upgrade}
 #   scripts of a given package

contrib/pactree.in

@@ -1,4 +1,4 @@
-#!@BASH@
+#!@BASH_SHELL@
 # pactree : a simple dependency tree viewer
 #
 # Copyright (C) 2008 Carlo "carlocci" Bersani <carlocci@gmail.com>

contrib/wget-xdelta.sh.in

@@ -1,4 +1,4 @@
-#!@BASH@
+#!@BASH_SHELL@
 
 if [ -r "@sysconfdir@/makepkg.conf" ]; then
 	source @sysconfdir@/makepkg.conf

scripts/Makefile.am

@@ -35,7 +35,7 @@ edit = sed \
 	-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
 	-e 's|@localstatedir[@]|$(localstatedir)|g' \
 	-e 's|@prefix[@]|$(prefix)|g' \
-	-e 's|@BASH[@]|$(BASH)|g' \
+	-e 's|@BASH_SHELL[@]|$(BASH_SHELL)|g' \
 	-e 's|@PACKAGE_VERSION[@]|$(REAL_PACKAGE_VERSION)|g' \
 	-e 's|@PACKAGE_BUGREPORT[@]|$(PACKAGE_BUGREPORT)|g' \
 	-e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \

scripts/makepkg.sh.in

@@ -1,4 +1,4 @@
-#!@BASH@ -e
+#!@BASH_SHELL@ -e
 #
 #   makepkg - make packages compatible for use with pacman
 #   @configure_input@

scripts/pacman-optimize.sh.in

@@ -1,4 +1,4 @@
-#!@BASH@
+#!@BASH_SHELL@
 #
 #   pacman-optimize
 #   @configure_input@

scripts/pkgdelta.sh.in

@@ -1,4 +1,4 @@
-#!@BASH@
+#!@BASH_SHELL@
 #
 #   pkgdelta - create delta files for use with pacman and repo-add
 #   @configure_input@

scripts/rankmirrors.sh.in

@@ -1,4 +1,4 @@
-#!@BASH@
+#!@BASH_SHELL@
 #
 #   rankmirrors - read a list of mirrors from a file and rank them by speed
 #   @configure_input@

scripts/repo-add.sh.in

@@ -1,4 +1,4 @@
-#!@BASH@
+#!@BASH_SHELL@
 #
 #   repo-add - add a package to a given repo database file
 #   repo-remove - remove a package entry from a given repo database file