From 3c8e93c28ec1388a2a9436d2dd7fb8687e9ce333 Mon Sep 17 00:00:00 2001
From: Michael Boelen <michael.boelen@cisofy.com>
Date: Fri, 28 Oct 2016 11:47:31 +0200
Subject: Improve usage and display of update tool

---
 include/helper_update | 13 +++++++------
 include/parameters    | 12 +++++++-----
 2 files changed, 14 insertions(+), 11 deletions(-)

(limited to 'include')

diff --git a/include/helper_update b/include/helper_update
index 8b93124e..a46c075b 100644
--- a/include/helper_update
+++ b/include/helper_update
@@ -47,6 +47,7 @@
 ######################################################################
 
 LOCAL_VERSION="-"
+RUN_UPDATE_CHECK=1
 SERVER_VERSION=""
 PERFORM_UPGRADE=0
 QUIET=0
@@ -254,19 +255,19 @@ elif [ "$1" = "info" ]; then
 
         echo ""; echo " == ${WHITE}${PROGRAM_NAME}${NORMAL} =="
         echo ""
-        echo "  Version         : ${PROGRAM_VERSION}"
-        echo -n "  Status          : "
+        echo "  Version            : ${PROGRAM_VERSION}"
+        echo -n "  Status             : "
         if [ ${PROGRAM_LV} -eq 0 ]; then
             echo "${RED}Unknown${NORMAL}";
           elif [ ${PROGRAM_LV} -gt ${PROGRAM_AC} ]; then
             echo "${YELLOW}Outdated${NORMAL}";
-            echo "  Current version : ${PROGRAM_AC}"
-            echo "  Latest version  : ${PROGRAM_LV}"
+            echo "  Installed version  : ${PROGRAM_AC}"
+            echo "  Latest version     : ${PROGRAM_LV}"
           else
             echo "${GREEN}Up-to-date${NORMAL}"
         fi
-        echo "  Release date    : ${PROGRAM_RELEASE_DATE}"
-        echo "  Update location : ${PROGRAM_WEBSITE}"
+        echo "  Release date       : ${PROGRAM_RELEASE_DATE}"
+        echo "  Update location    : ${PROGRAM_WEBSITE}"
         echo ""; echo ""
         echo "${PROGRAM_COPYRIGHT}"
         echo ""
diff --git a/include/parameters b/include/parameters
index 6f5d37e0..978c0b01 100644
--- a/include/parameters
+++ b/include/parameters
@@ -116,14 +116,14 @@
             show)
                 CHECK_BINARIES=0
                 HELPER="show"
+                LOGTEXT=0
                 QUIET=1
                 RUN_HELPERS=1
                 RUN_TESTS=0
                 RUN_UPDATE_CHECK=0
                 SKIP_PLUGINS=1
-                LOGTEXT=0
-                SHOW_TOOL_TIPS=0
                 SHOW_PROGRAM_DETAILS=0
+                SHOW_TOOL_TIPS=0
                 shift; HELPER_PARAMS="$@"
                 break
             ;;
@@ -135,12 +135,14 @@
                 QUIET=1
                 SKIP_PLUGINS=1
                 RUN_TESTS=0
+                RUN_UPDATE_CHECK=0
                 SHOW_PROGRAM_DETAILS=0
-                if [ ! $2 = "" ]; then
+                SHOW_TOOL_TIPS=0
+                if [ $# -gt 1 ]; then
                     shift
-                    HELPER_PARAMS="$1 $2"
+                    HELPER_PARAMS="$1"
                     break
-                  else
+                else
                     echo "${RED}Error: ${WHITE}Need a target for update${NORMAL}"
                     echo " "
                     echo "Examples:"
-- 
cgit v1.2.3