summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-10-15 09:34:16 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-16 14:07:29 +0100
commit9f68f317e33d617558fce3427a94e14ef65c7d88 (patch)
treebca0cc41a18e0db389bfc4dda23e64d3b6ccd304
parent4b8cb1098ad73b4e9dc65b5c6de7d11d2e2468c7 (diff)
downloadbitbake-9f68f317e33d617558fce3427a94e14ef65c7d88.tar.gz
toaster: set TOASTER_MANAGED variable
Set TOASTER_MANAGED to 1 if toaster is run as a script. Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbin/toaster5
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/toaster b/bin/toaster
index d7c5a845e..cf93e9fd9 100755
--- a/bin/toaster
+++ b/bin/toaster
@@ -176,6 +176,8 @@ else
TOASTER=$0
fi
+[ `basename \"$0\"` = `basename \"${TOASTER}\"` ] && TOASTER_MANAGED=1
+
BBBASEDIR=`dirname $TOASTER`/..
RUNNING=0
@@ -232,7 +234,7 @@ for param in $*; do
esac
done
-if [ `basename \"$0\"` = `basename \"${TOASTER}\"` ]; then
+if [ "$TOASTER_MANAGED" = '1' ]; then
# We are called as standalone. We refuse to run in a build environment - we need the interactive mode for that.
# Start just the web server, point the web browser to the interface, and start any Django services.
@@ -279,7 +281,6 @@ if [ `basename \"$0\"` = `basename \"${TOASTER}\"` ]; then
do_cleanup
fi
}
- TOASTER_MANAGED=1
export TOASTER_MANAGED=1
if [ $WEBSERVER -gt 0 ] && ! webserverStartAll; then
echo "Failed to start the web server, stopping" 1>&2