Refactor and support long comm line options

scripts/bootstrap.sh

@@ -3,38 +3,38 @@
 usage() {
   cat << EOF
 usage: ${0##*/} [command]
-    -h                  Print this help message.
+    -h | --help         Print this help message.
-    -w                  Use whiptail.
+    -d | --dialog       Use dialog.
-    -d                  Use dialog.
+    -l | --log          Log to CocoRice.log file.
-    -l                  Log to CocoRice.log file.
 EOF
 }
 
 checkParameters() {
-    local counter=0
+    while [ -n "$1" ]; do
-    while getopts ':hwdfp' flag; do
+        case $1 in
-        case $flag in
+            -h | --help)
-            h)
                 usage
                 exit 0
                 ;;
-            d)
+            -d | --dialog)
+                echo "dialog"
                 checkForDependencies "dialog"
                 setDialogBox "dialog"
                 ;;
-            f)
+            -l | --log)
                 checkForDependencies "libnewt"
                 setDialogBox "whiptail"
-                setDebugToFile true
+                setLogToFile true
                 ;;
-            p) 
+            -p | --packages) 
                 installPackages=true
                 ;;
-            ?)
+            *)
-                printf '%s: invalid option -%s\n' "${0##*/}" "$OPTARG"
+                printf '%s: invalid option %s\n' "${0##*/}" "$1"
                 exit 1
                 ;;
         esac
+        shift
     done
 
     if [ -z "$(getDialogBox)" ]; then

scripts/common.sh

@@ -163,10 +163,10 @@ getDialogBox() {
     echo "$dialogBox"
 }
 
-setDebugToFile() {
+setLogToFile() {
-    export debugFlagToFile=${1}
+    export logToFile=${1}
 }
 
 debug() {
-    [[ -z ${debugFlagToFile+x} || $debugFlagToFile = true ]] && tee -a CocoRice.log > /dev/null
+    [[ -z ${logToFile+x} || $logToFile = true ]] && tee -a CocoRice.log > /dev/null
 }