From 643c42069a2788e9f40fa1bc9845f32aed3d096c Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Thu, 15 Oct 2015 09:34:17 -0700 Subject: [PATCH] toaster: exit or return depending on the mode When toaster script is sourced 'return' should be used as using 'exit' will cause script to exit the shell and close terminal window. If script is called 'exit' should be used. Otherwise shell will throw and error: return: can only `return' from a function or sourced script Used 'return' or 'exit' depending on the toaster mode using TOASTER_MANAGED variable. Signed-off-by: Ed Bartosh Signed-off-by: brian avery Signed-off-by: Richard Purdie --- bin/toaster | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/toaster b/bin/toaster index cf93e9fd989..2c3432c24ae 100755 --- a/bin/toaster +++ b/bin/toaster @@ -201,7 +201,7 @@ if [ "$TOASTER_CONF" = "" ]; then fi if [ ! -f $TOASTER_CONF ]; then echo "$TOASTER_CONF configuration file not found. set TOASTER_CONF to specify a path" - exit 1; + [ "$TOASTER_MANAGED" = '1' ] && exit 1 || return 1 fi # this defines the dir toaster will use for # 1) clones of layers (in _toaster_clones ) -- 2.47.3