From: brian avery Date: Wed, 7 Oct 2015 12:17:36 +0000 (+0300) Subject: toaster: remove bashisms so script works in dash as well X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=be2d04c1831608922f90da03cb26d7fd5c863a47;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git toaster: remove bashisms so script works in dash as well [YOCTO #8217] Signed-off-by: brian avery Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- diff --git a/bin/toaster b/bin/toaster index f1aee627e2a..bc439e6d3af 100755 --- a/bin/toaster +++ b/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 -