try harder to find valid path to 'bash'

try harder to find valid path to 'bash'

[Anthony Foiani]

[-- Attachment #1: Type: text/plain, Size: 1688 bytes --]

[Apologies if some of you get this twice -- I sent it out via HTML
originally, sorry!]

Yann, All --

I don't know if it's a peculiarity of my setup, but I was getting
errors from the "trivial checks" that 'bash' isn't a valid shell.
This fixed it for me (on a fairly new Fedora 16 x86-64 host);
hopefully it'll help others, or you can tell me where/how I'm being
stupid.  :)

(Root cause that I'm fixing here seems to be that you have a variable
named "bash" in your environment that contains the full path to the
bash executable.  I don't have such a variable, but there is one named
BASH [note caps vs. lowercase] which has that path, and the latter is
"more standard" so far as I know.  And this probably should be a note
on the changeset; sorry about that...)

Happy holidays!

(Patch inline below, also attached in case gmail decides to munge whitespace...)

# HG changeset patch
# User Anthony Foiani <anthony.foiani@gmail.com>
# Date 1324030286 25200
# Branch ajf-fix_bash_path
# Node ID 054f80c2e1b9ff5e6b2a5c437d21e8bd58e40cf1
# Parent  4193d6e6a17430a177fa88c287879c2c35e319f3
try harder to get a valid path to bash.

diff -r 4193d6e6a174 -r 054f80c2e1b9 config/global/build-behave.in
--- a/config/global/build-behave.in    Tue Dec 13 23:32:39 2011 +0100
+++ b/config/global/build-behave.in    Fri Dec 16 03:11:26 2011 -0700
@@ -128,5 +128,5 @@
     string
     default "/bin/sh"                   if CONFIG_SHELL_SH
     default "/bin/ash"                  if CONFIG_SHELL_ASH
-    default "${bash}"                   if CONFIG_SHELL_BASH
+    default "${BASH:-/bin/bash}"        if CONFIG_SHELL_BASH
     default CONFIG_SHELL_CUSTOM_PATH    if CONFIG_SHELL_CUSTOM || BACKEND

[-- Attachment #2: ajf-fix_bash_path-01.patch --]
[-- Type: text/x-patch, Size: 843 bytes --]

# HG changeset patch
# User Anthony Foiani <anthony.foiani@gmail.com>
# Date 1324030286 25200
# Branch ajf-fix_bash_path
# Node ID 054f80c2e1b9ff5e6b2a5c437d21e8bd58e40cf1
# Parent  4193d6e6a17430a177fa88c287879c2c35e319f3
try harder to get a valid path to bash.

diff -r 4193d6e6a174 -r 054f80c2e1b9 config/global/build-behave.in
--- a/config/global/build-behave.in	Tue Dec 13 23:32:39 2011 +0100
+++ b/config/global/build-behave.in	Fri Dec 16 03:11:26 2011 -0700
@@ -128,5 +128,5 @@
     string
     default "/bin/sh"                   if CONFIG_SHELL_SH
     default "/bin/ash"                  if CONFIG_SHELL_ASH
-    default "${bash}"                   if CONFIG_SHELL_BASH
+    default "${BASH:-/bin/bash}"        if CONFIG_SHELL_BASH
     default CONFIG_SHELL_CUSTOM_PATH    if CONFIG_SHELL_CUSTOM || BACKEND
exporting patch:
<fdopen>

[-- Attachment #3: Type: text/plain, Size: 71 bytes --]

--
For unsubscribe information see http://sourceware.org/lists.html#faq