소스 검색

Move version printing routine to saturnin.sh module

Alois Mahdal 9 년 전
부모
커밋
99770e4f06
2개의 변경된 파일11개의 추가작업 그리고 6개의 파일을 삭제
  1. 2
    6
      src/bin/satcmd.skel
  2. 9
    0
      src/shellfu/saturnin.sh

+ 2
- 6
src/bin/satcmd.skel 파일 보기

24
 SATURNIN_LIBEXEC="__SATURNIN_LIBEXEC__"
24
 SATURNIN_LIBEXEC="__SATURNIN_LIBEXEC__"
25
 SATURNIN_LIBEXEC_PREFIX="satcmd-"
25
 SATURNIN_LIBEXEC_PREFIX="satcmd-"
26
 SATURNIN_APP_VERSION="__MKIT_PROJ_VERSION__"
26
 SATURNIN_APP_VERSION="__MKIT_PROJ_VERSION__"
27
+SATURNIN_APP_TAGLINE="__MKIT_PROJ_TAGLINE__"
27
 
28
 
28
 #
29
 #
29
 # =====END BUILT PART=====
30
 # =====END BUILT PART=====
40
             "--version"
41
             "--version"
41
 }
42
 }
42
 
43
 
43
-version_info() {
44
-    echo "$(basename "$0") (Spirit of your toolbox) $SATURNIN_APP_VERSION"
45
-    exit "$SHELLFU_EXIT_OK"
46
-}
47
-
48
 while true; do case $1 in
44
 while true; do case $1 in
49
     -d|--debug)     export SHELLFU_DEBUG=true; shift   ;;
45
     -d|--debug)     export SHELLFU_DEBUG=true; shift   ;;
50
     -v|--verbose)   export SHELLFU_VERBOSE=true; shift ;;
46
     -v|--verbose)   export SHELLFU_VERBOSE=true; shift ;;
51
-    --version)      version_info                    ;;
47
+    --version)      saturnin__version; exit            ;;
52
     --version-semver) echo "$SATURNIN_APP_VERSION"; exit ;;
48
     --version-semver) echo "$SATURNIN_APP_VERSION"; exit ;;
53
     -*)             usage;                          ;;
49
     -*)             usage;                          ;;
54
     --*)            usage;                          ;;
50
     --*)            usage;                          ;;

+ 9
- 0
src/shellfu/saturnin.sh 파일 보기

68
     "$binpath" "$@"
68
     "$binpath" "$@"
69
 }
69
 }
70
 
70
 
71
+saturnin__version() {
72
+    #
73
+    # Print version info
74
+    #
75
+    local tagline=${SATURNIN_APP_TAGLINE:-Some app with default tagline}
76
+    echo "$(basename "$0") ($tagline) $SATURNIN_APP_VERSION"
77
+    return "$SHELLFU_EXIT_OK"
78
+}
79
+
71
 saturnin__wraphook() {
80
 saturnin__wraphook() {
72
     #
81
     #
73
     # Wrap command "$@" in hooks
82
     # Wrap command "$@" in hooks