flattened, simplified command/subcommand ux

+ handle devenv for _reve
+ detailed help message, better formatting
- remove dependency getopt

reve.sh

@@ -7,17 +7,6 @@ in_desktop_mode=""
 in_reason=""
 in_chore_name=""
 
-SHORTOPTS="h,m:r:c:w,"
-LONGOPTS="help,mode:,reason:,chore:,where"
-
-PARSED_OPTS=$(getopt --options $SHORTOPTS --longoptions $LONGOPTS --name "$0" -- "$@")
-if [[ $? -ne 0 ]]; then
-    echo "Failed to parse options."
-    exit 1
-fi
-
-eval set -- "$PARSED_OPTS"
-
 rt_script_dir=$(realpath "$(dirname "$0")")
 rt_has_mode_changed=0
 
@@ -28,15 +17,40 @@ reve_time_night="$reve_folder/time_night"
 
 reve_chores_mode="$rt_script_dir/chores/mode"
 
-source "$rt_script_dir/_reve"
+# bring reve utility functions to the context
+# shellcheck disable=SC1091
+source "$rt_script_dir/_reve" >&/dev/null
+# shellcheck disable=SC1091
+(( $? == 1 )) && source "$rt_script_dir/_reve.sh" # looks like we're in dev environment
 
 util_help () {
-    echo "Usage: $0 [options]"
+    local command="$1"
-    echo "Options:"
+
-    echo "desktop_mode  (-m, --mode):   dark, light"
+    case $command in
-    echo "reason        (-r, --reason): time, network"
+        reve|'')
-    echo "chore         (-c, --chore):  chore_name"
+            echo "=> Usage: reve [command] OR reve [subcommand] [command]"
-    echo "where         (-w, --where):  returns where reve's installed"
+            echo "== Commands =="
+            echo "mode      {desktop_mode}    sets desktop mode, accepts 'dark' or 'light'"
+            echo "reason    {reason}          run reve with reason, accepts 'network' or 'time'"
+            echo "chore     {chore_name}      run a single chore, accepts chore name"
+            echo "where                       returns where reve's installed"
+            echo "help      [subcommand]      shows help message"
+            echo "== Subcommands =="
+            echo "1. config                   gets/sets configuration values"
+            echo "2. update                   updates chores"
+            ;;
+        config)
+            echo "=> Usage"
+            echo "1. reve config get {config_key}            get the value stored in file"
+            echo "2. reve config set {config_key} {value}    set the value of file"
+            ;;
+        update)
+            echo "=> Usage: reve update [chore names...]       updates chores from upstream"
+            echo "== Details =="
+            echo "Updates all chores present on your configuration if nothing is given. The" 
+            echo "chore names must be space delimited."
+            ;;
+    esac
 }
 
 util_mkdirs () {
@@ -132,44 +146,42 @@ main () {
     fi
 }
 
-while true; do
+case "$1" in
-    case "$1" in
+    config)
-        -h|--help)
+        sub_config
-            util_help
+        exit 0
-            exit 0
+        ;;
-            ;;
+    update)
-        -m|--mode)
+        sub_update
-            in_desktop_mode="$2"
+        exit 0
-            shift 2
+        ;;
-            ;;
+    help)
-        -r|--reason)
+        util_help "$2"
-            in_reason="$2"
+        exit 0
-            shift 2
+        ;;
-            ;;
+    where)
-        -c|--chore)
+        dirname "$( which reve )"
-            in_chore_name="$2"
+        exit 0
-            shift 2
+        ;;
-            ;;
+    shell-completion)
-        -w|--where)
+        in_shell_comp="$2"
-            dirname "$( which reve )"
+        f_shell_completion
-            exit 0
+        exit 0
-            ;;
+        ;;
-        --shell-completion)
+    mode)
-            in_shell_comp="$2"
+        in_desktop_mode="$2"
-            shift 2
+        ;;
-            f_shell_completion
+    reason)
-            exit 0
+        in_reason="$2"
-            ;;
+        ;;
-        --)
+    chore)
-            shift
+        in_chore_name="$2"
-            break
+        ;;
-            ;;
+    *)
-        *)
+        echo "Invalid command or subcommand: $1"
-            echo "Invalid option: $1"
+        exit 1
-            exit 1
+        ;;
-            ;;
+esac
-    esac
-done
 
 prepare
 main