浏览代码

Move usage() to saturnin.sh module

Alois Mahdal 9 年前
父节点
当前提交
594e675521
共有 2 个文件被更改,包括 9 次插入9 次删除
  1. 3
    9
      src/bin/satcmd.skel
  2. 6
    0
      src/shellfu/saturnin.sh

+ 3
- 9
src/bin/satcmd.skel 查看文件

36
 export SHELLFU_INIGREP_PATH SHELLFU_PATH SHELLFU_PRETTY_USAGE \
36
 export SHELLFU_INIGREP_PATH SHELLFU_PATH SHELLFU_PRETTY_USAGE \
37
        SATURNIN_CACHE_HOME
37
        SATURNIN_CACHE_HOME
38
 
38
 
39
-usage() {
40
-    mkusage "[-d|-v] command [args...]" \
41
-            "help" \
42
-            "--version"
43
-}
44
-
45
 main() {
39
 main() {
46
     local subcommand
40
     local subcommand
47
     while true; do case $1 in
41
     while true; do case $1 in
49
         -v|--verbose)   export SHELLFU_VERBOSE=true; shift ;;
43
         -v|--verbose)   export SHELLFU_VERBOSE=true; shift ;;
50
         --version)      saturnin__version; exit            ;;
44
         --version)      saturnin__version; exit            ;;
51
         --version-semver) echo "$SATURNIN_APP_VERSION"; exit ;;
45
         --version-semver) echo "$SATURNIN_APP_VERSION"; exit ;;
52
-        -*)             usage;                          ;;
53
-        --*)            usage;                          ;;
46
+        -*)             saturnin__usage;                ;;
47
+        --*)            saturnin__usage;                ;;
54
         --)             shift; break                    ;;
48
         --)             shift; break                    ;;
55
-        "")             usage;                          ;;
49
+        "")             saturnin__usage;                ;;
56
         *)              break;                          ;;
50
         *)              break;                          ;;
57
     esac done
51
     esac done
58
     subcommand="$1"; shift
52
     subcommand="$1"; shift

+ 6
- 0
src/shellfu/saturnin.sh 查看文件

68
     "$binpath" "$@"
68
     "$binpath" "$@"
69
 }
69
 }
70
 
70
 
71
+saturnin__usage() {
72
+    mkusage "[-d|-v] command [args...]" \
73
+            "help" \
74
+            "--version"
75
+}
76
+
71
 saturnin__version() {
77
 saturnin__version() {
72
     #
78
     #
73
     # Print version info
79
     # Print version info