1 files changed, 39 insertions, 25 deletions

diff --git a/apps/db_assembler/db_assembler.sh b/apps/db_assembler/db_assembler.sh
index 4b4c23e5b9..e1e1de240a 100644
--- a/apps/db_assembler/db_assembler.sh
+++ b/apps/db_assembler/db_assembler.sh
@@ -6,56 +6,70 @@ source "$CURRENT_PATH/includes/includes.sh"
 
 cmdopt=$1
 
-while true
-do
-echo "=====     DB ASSEMBLER MENU     ====="
-PS3='Please enter your choice: '
+PS3='[Please enter your choice]: '
 options=(
-    "Assemble ALL" "Assemble only bases" "Assemble only updates" "Assemble only customs"
-    "Quit"
-    "Assemble & import ALL" "Assemble & import only bases" "Assemble & import only updates" "Assemble & import only customs" 
+    "all: Assemble all"                              # 1
+    "bases: Assemble only bases"                      # 2
+    "updates: Assemble only updates"                 # 3
+    "customs: Assemble only customs"                  # 4
+    "import-all: Assemble & Import all"              # 5
+    "import-bases: Assemble & Import only bases"      # 6
+    "import-updates: Assemble & Import only updates" # 7
+    "import-customs:  Assemble & Import only customs" # 8
+    "quit: Exit from this menu"                      # 9
     )
 
 function _switch() {
-    case $1 in
-        "Assemble ALL")
+    _reply="$1"
+    _opt="$2"
+
+    case $_reply in
+        ""|"all"|"1")
             dbasm_run true true true
             ;;
-        "Assemble only bases")
+        ""|"bases"|"2")
             dbasm_run true false false
             ;;
-        "Assemble only updates")
+        ""|"updates"|"3")
             dbasm_run false true false
             ;;
-        "Assemble only customs")
+        ""|"customs"|"4")
             dbasm_run false false true
             ;;
-        "Assemble & import ALL")
+        ""|"import-all"|"5")
             dbasm_import true true true
             ;;
-        "Assemble & import only bases")
+        ""|"import-bases"|"6")
             dbasm_import true false false
             ;;
-        "Assemble & import only updates")
+        ""|"import-updates"|"7")
             dbasm_import false true false
             ;;
-        "Assemble & import only customs")
+        ""|"import-customs"|"8")
             dbasm_import false false true
             ;;
-        "Quit")
+        ""|"quit"|"9")
             echo "Goodbye!"
             exit
             ;;
-        *) echo invalid option;;
+        ""|"--help")
+            echo "Available commands:"
+            printf '%s\n' "${options[@]}"
+            ;;
+        *) echo "invalid option, use --help option for the commands list";;
     esac
 }
 
-# run option directly if specified in argument
-[ ! -z $1 ] && _switch "${options[$cmdopt-1]}" && exit 0
-
-select opt in "${options[@]}"
+while true
 do
-    _switch "$opt"
-    break
-done
+    # run option directly if specified in argument
+    [ ! -z $1 ] && _switch $@
+    [ ! -z $1 ] && exit 0
+
+    select opt in "${options[@]}"
+    do
+        echo "=====     DB ASSEMBLER MENU     ====="
+        _switch $REPLY
+        break
+    done
 done