fix bash autoconfiguration

fix bash autoconfiguration

[David Bremner]

Testing by people running with /bin/sh = bash welcome.  The bug shows
up as a shebang of /bin/sh in /usr/bin/notmuch-emacs-mua

[PATCH 1/2] configure: don't use special variable BASH

[David Bremner]

bash, in it's wisdom, sets that variable when invoked as /bin/sh, but
then doesn't act as bash, at least not to the degree we need to run
scripts.
---
 configure | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index b2200be0..ea22587b 100755
--- a/configure
+++ b/configure
@@ -53,7 +53,7 @@ fi
 
 # Set several defaults (optionally specified by the user in
 # environment variables)
-BASH=${BASH:-bash}
+BASHCMD=${BASHCMD:-bash}
 PERL=${PERL:-perl}
 CC=${CC:-cc}
 CXX=${CXX:-c++}
@@ -560,13 +560,13 @@ else
 fi
 
 printf "Checking for bash... "
-if command -v ${BASH} > /dev/null; then
+if command -v ${BASHCMD} > /dev/null; then
     have_bash=1
-    bash_absolute=$(command -v ${BASH})
+    bash_absolute=$(command -v ${BASHCMD})
     printf "Yes (%s).\n" "$bash_absolute"
 else
     have_bash=0
-    printf "No. (%s not found)\n" "${BASH}"
+    printf "No. (%s not found)\n" "${BASHCMD}"
 fi
 
 printf "Checking for perl... "
-- 
2.20.1

[PATCH 2/2] Debian: use new variable to force bash location

[David Bremner]

This should no longer be needed on the official debian autobuilders,
but it might help others with merged /usr build environments.
---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index c8ecb1ac..d056edb6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ python3_all = py3versions -s | xargs -n1 | xargs -t -I {} env {}
 	dh $@ --with python2,python3,elpa
 
 override_dh_auto_configure:
-	BASH=/bin/bash	./configure --prefix=/usr \
+	BASHCMD=/bin/bash ./configure --prefix=/usr \
 		--libdir=/usr/lib/$$(dpkg-architecture -q DEB_TARGET_MULTIARCH) \
 		--includedir=/usr/include \
 		--mandir=/usr/share/man \
-- 
2.20.1

Re: fix bash autoconfiguration

[Tomi Ollila]

On Wed, Jan 16 2019, David Bremner wrote:

> Testing by people running with /bin/sh = bash welcome.  The bug shows
> up as a shebang of /bin/sh in /usr/bin/notmuch-emacs-mua

LGTM

Tomi

Re: fix bash autoconfiguration

[David Bremner]

David Bremner <david@tethera.net> writes:

> Testing by people running with /bin/sh = bash welcome.  The bug shows
> up as a shebang of /bin/sh in /usr/bin/notmuch-emacs-mua
>

Last call for testing by people with /bin/sh = bash.

d