[Toaster] [TOASTER] [PATCH 5/5] toaster: remove bashisms so script works in dash as well
brian avery
avery.brian at gmail.com
Tue Oct 6 17:38:28 PDT 2015
[YOCTO #8217]
Signed-off-by: brian avery <avery.brian at gmail.com>
---
bitbake/bin/toaster | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index f1aee62..bc439e6 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -162,7 +162,7 @@ RUNNING=0
NOTOASTERUI=0
WEBSERVER=1
TOASTER_BRBE=""
-if [ "$WEB_PORT" == "" ]; then
+if [ "$WEB_PORT" = "" ]; then
WEB_PORT="8000"
fi
# this is the configuraton file we are using for toaster
@@ -172,13 +172,13 @@ fi
# note: for future there are a number of relative path assumptions
# in the local layers that currently prevent using an arbitrary
# toasterconf.json
-if [ "$TOASTER_CONF" == "" ]; then
- BIN_DIR=$(dirname "${BASH_SOURCE[0]}")
+if [ "$TOASTER_CONF" = "" ]; then
+ BIN_DIR=$(dirname -- "$0")
export TOASTER_CONF="$BIN_DIR/../../meta-yocto/conf/toasterconf.json"
fi
if [ ! -f $TOASTER_CONF ]; then
echo "$TOASTER_CONF configuration file not found, exiting..."
- exit -1
+ exit 1;
fi
# this defines the dir toaster will use for
# 1) clones of layers (in _toaster_clones )
@@ -375,4 +375,3 @@ case $CMD in
echo "Successful ${CMD}."
;;
esac
-
--
1.9.1
More information about the toaster
mailing list