summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2010-10-13 17:50:54 -0500
committerDan McGee <dan@archlinux.org>2010-10-13 17:50:54 -0500
commit6eedf06fcc224648155bc5253d6fe1975be8da00 (patch)
tree98ab83ec4927766ba88f2bbf819a59a5d8cb9f35 /scripts
parenta7dc3875f15f9600e011c313c8846de6af3a2c8c (diff)
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>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.am2
-rw-r--r--scripts/makepkg.sh.in2
-rw-r--r--scripts/pacman-optimize.sh.in2
-rw-r--r--scripts/pkgdelta.sh.in2
-rw-r--r--scripts/rankmirrors.sh.in2
-rw-r--r--scripts/repo-add.sh.in2
6 files changed, 6 insertions, 6 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index b9e3038f..78deb0b9 100644
--- a/scripts/Makefile.am
+++ b/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' \
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index afedc314..9220032c 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1,4 +1,4 @@
-#!@BASH@ -e
+#!@BASH_SHELL@ -e
#
# makepkg - make packages compatible for use with pacman
# @configure_input@
diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in
index eb6691c8..f4642abf 100644
--- a/scripts/pacman-optimize.sh.in
+++ b/scripts/pacman-optimize.sh.in
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@BASH_SHELL@
#
# pacman-optimize
# @configure_input@
diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in
index d45678d9..6bc3f5da 100644
--- a/scripts/pkgdelta.sh.in
+++ b/scripts/pkgdelta.sh.in
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@BASH_SHELL@
#
# pkgdelta - create delta files for use with pacman and repo-add
# @configure_input@
diff --git a/scripts/rankmirrors.sh.in b/scripts/rankmirrors.sh.in
index 3851b771..64d5a73c 100644
--- a/scripts/rankmirrors.sh.in
+++ b/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@
diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in
index 9bc70696..d3e3bc82 100644
--- a/scripts/repo-add.sh.in
+++ b/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