[gnome-continuous-yocto/gnomeostree-3.28-rocko: 54/8267] bitbake: toaster: bin/toaster Add help text for unrecognised command



commit 4446b351388825820ce2ef634383368920648bce
Author: Michael Wood <michael g wood intel com>
Date:   Thu Apr 21 14:22:04 2016 +0100

    bitbake: toaster: bin/toaster Add help text for unrecognised command
    
    Add help text for unrecognised or missing command for toaster script
    Remove assumption that no command is 'start' as the default.
    
    (Bitbake rev: 4c0b1b9c2af70838dbcf5a676ec679f9f0c488a5)
    
    Signed-off-by: Michael Wood <michael g wood intel com>
    Signed-off-by: Elliot Smith <elliot smith intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/bin/toaster |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)
---
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index 70c66d2..2d07255 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -17,10 +17,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see http://www.gnu.org/licenses/.
 
-# Usage: source toaster [start|stop]
-#                       [webport=<port>] [noui] [noweb]
-
-# Helper function to kill a background toaster development server
+HELP="
+Usage: source toaster start|stop [webport=<address:port>] [noweb]
+    Optional arguments:
+        [noweb] Setup the environment for building with toaster but don't start the development server
+        [webport] Set the development server (default: localhost:8000)
+"
 
 webserverKillAll()
 {
@@ -193,6 +195,12 @@ for param in $*; do
     ;;
     webport=*)
             WEB_PORT="${param#*=}"
+    ;;
+    *)
+            echo "$HELP"
+            return 1
+    ;;
+
     esac
 done
 
@@ -226,11 +234,9 @@ if [ "$CMD" = "start" ] ; then
        return 1
 fi
 elif [ "$CMD" = "" ]; then
-    if [ -z "$BBSERVER" ]; then
-        CMD="start"
-    else
-        CMD="stop"
-    fi
+    echo "No command specified"
+    echo "$HELP"
+    return 1
 fi
 
 echo "The system will $CMD."


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]