Skip to content

Commit 6d39ee0

Browse files
committed
* fix MULLE_BASH_EXE_SHELL not being honored (any more ?)
1 parent 26cedfb commit 6d39ee0

File tree

4 files changed

+33
-14
lines changed

4 files changed

+33
-14
lines changed

RELEASENOTES.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
### 6.2.3
2+
3+
* fix `MULLE_BASH_EXE_SHELL` not being honored (any more ?)
4+
15
### 6.2.2
26

37
* Various small improvements

mulle-bash

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,11 @@ then
7474

7575
if [ $? -eq 0 ]
7676
then
77-
exe_shell="${MULLE_BASH_EXE_SHELL}"
77+
exe_shell=
78+
if [ ! -z "${MULLE_BASH_EXE_SHELL}" ]
79+
then
80+
exe_shell="`command -v "${MULLE_BASH_EXE_SHELL}"`"
81+
fi
7882
if [ -z "${exe_shell}" ]
7983
then
8084
case "${_MULLE_UNAME}" in
@@ -145,7 +149,7 @@ fi
145149
# this is "our" version
146150
# the actual loaded version may differ (and will change this variable)
147151
#
148-
MULLE_BASHFUNCTIONS_VERSION="6.2.2"
152+
MULLE_BASHFUNCTIONS_VERSION="6.2.3"
149153
MULLE_BASHFUNCTIONS_LIBEXEC_DIRNAME="libexec"
150154
MULLE_EXECUTABLE="$1"
151155

src/mulle-bashloader.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@
3434
#
3535

3636
# double inclusion of this file is OK!
37+
38+
#
39+
# this file does the "include" command
40+
#
3741
if ! [ ${MULLE_BASHLOADER_SH+x} ]
3842
then
3943
MULLE_BASHLOADER_SH='included'

src/mulle-boot.sh

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,26 @@ then
2424

2525
if [ $? -eq 0 ]
2626
then
27-
case "${_MULLE_UNAME}" in
28-
[Dd]arwin)
29-
exe_shell="`command -v "zsh" `"
30-
exe_shell="${exe_shell:-zsh}" # for error if not installed
31-
;;
32-
33-
*)
34-
exe_shell="`command -v "bash" `"
35-
exe_shell="${exe_shell:-`command -v "zsh" `}"
36-
exe_shell="${exe_shell:-bash}" # for error if not installed
37-
;;
38-
esac
27+
exe_shell=
28+
if [ ! -z "${MULLE_BASH_EXE_SHELL}" ]
29+
then
30+
exe_shell="`command -v "${MULLE_BASH_EXE_SHELL}"`"
31+
fi
32+
if [ -z "${exe_shell}" ]
33+
then
34+
case "${_MULLE_UNAME}" in
35+
[Dd]arwin)
36+
exe_shell="`command -v "zsh" `"
37+
exe_shell="${exe_shell:-zsh}" # for error if not installed
38+
;;
3939

40+
*)
41+
exe_shell="`command -v "bash" `"
42+
exe_shell="${exe_shell:-`command -v "zsh" `}"
43+
exe_shell="${exe_shell:-bash}" # for error if not installed
44+
;;
45+
esac
46+
fi
4047
script="$0"
4148

4249
#

0 commit comments

Comments
 (0)