mirror of
https://github.com/powerline/powerline.git
synced 2025-07-28 08:14:41 +02:00
Use busybox as shell name in place of bb
Conflicts: tests/test_shells/test.sh
This commit is contained in:
parent
01185eb9c8
commit
7ade6d1fc0
@ -46,15 +46,7 @@ run_test() {
|
|||||||
test "x$ONLY_SHELL" = "x" || test "x$ONLY_SHELL" = "x$SH" || return 0
|
test "x$ONLY_SHELL" = "x" || test "x$ONLY_SHELL" = "x$SH" || return 0
|
||||||
|
|
||||||
if ! which "${SH}" ; then
|
if ! which "${SH}" ; then
|
||||||
if test "x${SH}" = "xbb" ; then
|
return 0
|
||||||
if ! which busybox ; then
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
shift
|
|
||||||
ARGS=( busybox ash "$@" )
|
|
||||||
else
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
export TEST_TYPE
|
export TEST_TYPE
|
||||||
@ -108,8 +100,8 @@ run_test() {
|
|||||||
dash)
|
dash)
|
||||||
# ?
|
# ?
|
||||||
;;
|
;;
|
||||||
bb)
|
busybox)
|
||||||
bb --help
|
busybox --help
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
${SH} --version
|
${SH} --version
|
||||||
@ -205,7 +197,7 @@ if test -z "${ONLY_SHELL}" || test "x${ONLY_SHELL%sh}" != "x${ONLY_SHELL}" || te
|
|||||||
FAILED=1
|
FAILED=1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! run_test $TEST_TYPE bb -i ; then
|
if ! run_test $TEST_TYPE busybox ash -i ; then
|
||||||
FAILED=1
|
FAILED=1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user