Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/contrib
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 /contrib
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 'contrib')
-rw-r--r--contrib/Makefile.am2
-rwxr-xr-xcontrib/bacman.in2
-rwxr-xr-xcontrib/pacdiff.in2
-rwxr-xr-xcontrib/pacscripts.in2
-rwxr-xr-xcontrib/pactree.in2
-rwxr-xr-xcontrib/wget-xdelta.sh.in2
6 files changed, 6 insertions, 6 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 01997631..55366b47 100644
--- a/contrib/Makefile.am
+++ b/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 $@;
diff --git a/contrib/bacman.in b/contrib/bacman.in
index 2a93f8be..991acb00 100755
--- a/contrib/bacman.in
+++ b/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
diff --git a/contrib/pacdiff.in b/contrib/pacdiff.in
index 716333a0..ac4ce893 100755
--- a/contrib/pacdiff.in
+++ b/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>
diff --git a/contrib/pacscripts.in b/contrib/pacscripts.in
index 123c79df..d3664091 100755
--- a/contrib/pacscripts.in
+++ b/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
diff --git a/contrib/pactree.in b/contrib/pactree.in
index 29c6af6c..b43005a8 100755
--- a/contrib/pactree.in
+++ b/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>
diff --git a/contrib/wget-xdelta.sh.in b/contrib/wget-xdelta.sh.in
index caf0171e..f2ac1c87 100755
--- a/contrib/wget-xdelta.sh.in
+++ b/contrib/wget-xdelta.sh.in
@@ -1,4 +1,4 @@
-#!@BASH@
+#!@BASH_SHELL@
if [ -r "@sysconfdir@/makepkg.conf" ]; then
source @sysconfdir@/makepkg.conf