File tree Expand file tree Collapse file tree 4 files changed +33
-14
lines changed Expand file tree Collapse file tree 4 files changed +33
-14
lines changed Original file line number Diff line number Diff line change
1
+ ### 6.2.3
2
+
3
+ * fix ` MULLE_BASH_EXE_SHELL ` not being honored (any more ?)
4
+
1
5
### 6.2.2
2
6
3
7
* Various small improvements
Original file line number Diff line number Diff line change 74
74
75
75
if [ $? -eq 0 ]
76
76
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
78
82
if [ -z " ${exe_shell} " ]
79
83
then
80
84
case " ${_MULLE_UNAME} " in
145
149
# this is "our" version
146
150
# the actual loaded version may differ (and will change this variable)
147
151
#
148
- MULLE_BASHFUNCTIONS_VERSION=" 6.2.2 "
152
+ MULLE_BASHFUNCTIONS_VERSION=" 6.2.3 "
149
153
MULLE_BASHFUNCTIONS_LIBEXEC_DIRNAME=" libexec"
150
154
MULLE_EXECUTABLE=" $1 "
151
155
Original file line number Diff line number Diff line change 34
34
#
35
35
36
36
# double inclusion of this file is OK!
37
+
38
+ #
39
+ # this file does the "include" command
40
+ #
37
41
if ! [ ${MULLE_BASHLOADER_SH+x} ]
38
42
then
39
43
MULLE_BASHLOADER_SH=' included'
Original file line number Diff line number Diff line change 24
24
25
25
if [ $? -eq 0 ]
26
26
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
+ ;;
39
39
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
40
47
script=" $0 "
41
48
42
49
#
You can’t perform that action at this time.
0 commit comments