Browse Source

Update after renaming of ffoo to shellfu

Alois Mahdal 8 years ago
parent
commit
91a55e625b
3 changed files with 27 additions and 27 deletions
  1. 7
    7
      mkit.ini
  2. 15
    15
      src/bin/satcmd.skel
  3. 5
    5
      src/shellfu/saturnin_meta.sh

+ 7
- 7
mkit.ini View File

33
     etc_bc  = /etc/bash_completion.d
33
     etc_bc  = /etc/bash_completion.d
34
 
34
 
35
 [vars]
35
 [vars]
36
-    __SATCMD_CACHE_HOME__     = $HOME/.local/share/satcmd
37
-    __SATCMD_CONFIG_USER__    = $HOME/.satcmd
38
-    __SATCMD_CONFIG_LOCAL__   = [roots:etc]
39
-    __SATCMD_LIBEXEC__        = [roots:libexec]
40
-    __SATCMD_SHARE__          = [roots:share]
41
-    __SATCMD_FFOO_DIR__       = [roots:share]/ffoo
36
+    __SATCMD_CACHE_HOME__       = $HOME/.local/share/satcmd
37
+    __SATCMD_CONFIG_USER__      = $HOME/.satcmd
38
+    __SATCMD_CONFIG_LOCAL__     = [roots:etc]
39
+    __SATCMD_LIBEXEC__          = [roots:libexec]
40
+    __SATCMD_SHARE__            = [roots:share]
41
+    __SATCMD_SHELLFU_DIR__      = [roots:share]/shellfu
42
 
42
 
43
 [files:bin]
43
 [files:bin]
44
     src/bin/satcmd              = satcmd
44
     src/bin/satcmd              = satcmd
50
     src/libexec/satcmd-echo     = satcmd-echo
50
     src/libexec/satcmd-echo     = satcmd-echo
51
 
51
 
52
 [files:share]
52
 [files:share]
53
-    src/ffoo/saturnin_meta.sh   = ffoo/saturnin_meta.sh
53
+    src/shellfu/saturnin_meta.sh = shellfu/saturnin_meta.sh

+ 15
- 15
src/bin/satcmd.skel View File

1
 #!/bin/bash
1
 #!/bin/bash
2
 
2
 
3
-. $(ffoom path) || exit 3
3
+. $(shellfu-get path) || exit 3
4
 
4
 
5
-ffoo import exit
6
-ffoo import inigrep
7
-ffoo import pretty
5
+shellfu import exit
6
+shellfu import inigrep
7
+shellfu import pretty
8
 
8
 
9
 #
9
 #
10
 # =====BEGIN BUILT PART=====
10
 # =====BEGIN BUILT PART=====
11
 #
11
 #
12
 
12
 
13
-FFOO_INIGREP_PATH="$(
13
+SHELLFU_INIGREP_PATH="$(
14
     inigrep__mkpath \
14
     inigrep__mkpath \
15
         __SATCMD_CONFIG_USER__/ini.d \
15
         __SATCMD_CONFIG_USER__/ini.d \
16
         __SATCMD_CONFIG_USER__ \
16
         __SATCMD_CONFIG_USER__ \
18
         __SATCMD_SHARE__/ini.d
18
         __SATCMD_SHARE__/ini.d
19
 )"
19
 )"
20
 
20
 
21
-FFOO_PATH="__SATCMD_FFOO_DIR__"
22
-FFOO_PRETTY_USAGE="subcommand"
21
+SHELLFU_PATH="__SATCMD_SHELLFU_DIR__"
22
+SHELLFU_PRETTY_USAGE="subcommand"
23
 SATCMD_CACHE_HOME="__SATCMD_CACHE_HOME__"
23
 SATCMD_CACHE_HOME="__SATCMD_CACHE_HOME__"
24
 SATURNIN_LIBEXEC="__SATCMD_LIBEXEC__"
24
 SATURNIN_LIBEXEC="__SATCMD_LIBEXEC__"
25
 SATURNIN_LIBEXEC_PREFIX="satcmd-"
25
 SATURNIN_LIBEXEC_PREFIX="satcmd-"
29
 # =====END BUILT PART=====
29
 # =====END BUILT PART=====
30
 #
30
 #
31
 
31
 
32
-ffoo import saturnin_meta
32
+shellfu import saturnin_meta
33
 
33
 
34
-export FFOO_INIGREP_PATH FFOO_PATH FFOO_PRETTY_USAGE \
34
+export SHELLFU_INIGREP_PATH SHELLFU_PATH SHELLFU_PRETTY_USAGE \
35
        SATCMD_VERSION SATCMD_CACHE_HOME
35
        SATCMD_VERSION SATCMD_CACHE_HOME
36
 
36
 
37
 usage() {
37
 usage() {
42
 
42
 
43
 version_info() {
43
 version_info() {
44
     echo "$(basename "$0") (Spirit of your toolbox) $SATCMD_VERSION"
44
     echo "$(basename "$0") (Spirit of your toolbox) $SATCMD_VERSION"
45
-    exit "$FFOO_EXIT_OK"
45
+    exit "$SHELLFU_EXIT_OK"
46
 }
46
 }
47
 
47
 
48
 while true; do case $1 in
48
 while true; do case $1 in
49
-    -d|--debug)     export FFOO_DEBUG=true; shift   ;;
50
-    -v|--verbose)   export FFOO_VERBOSE=true; shift ;;
49
+    -d|--debug)     export SHELLFU_DEBUG=true; shift   ;;
50
+    -v|--verbose)   export SHELLFU_VERBOSE=true; shift ;;
51
     --version)      version_info                    ;;
51
     --version)      version_info                    ;;
52
     --version-semver) echo "$SATCMD_VERSION"; exit ;;
52
     --version-semver) echo "$SATCMD_VERSION"; exit ;;
53
     -*)             usage;                          ;;
53
     -*)             usage;                          ;;
57
     *)              break;                          ;;
57
     *)              break;                          ;;
58
 esac done
58
 esac done
59
 
59
 
60
-debug -v FFOO_PATH SATURNIN_LIBEXEC FFOO_INIGREP_PATH
60
+debug -v SHELLFU_PATH SATURNIN_LIBEXEC SHELLFU_INIGREP_PATH
61
 debug "\$*='$*'"
61
 debug "\$*='$*'"
62
 
62
 
63
 export SATURNIN_SUBCOMMAND="$1"
63
 export SATURNIN_SUBCOMMAND="$1"
67
     conf)               inigrep "$@"    ;;
67
     conf)               inigrep "$@"    ;;
68
     help)               saturnin_help ;;
68
     help)               saturnin_help ;;
69
     _ls_subcommands)    saturnin_lssc ;;
69
     _ls_subcommands)    saturnin_lssc ;;
70
-    _lsfun)             ffoom lsfun ;;
71
-    _lsmod)             ffoom lsmod ;;
70
+    _lsfun)             shellfu-get lsfun ;;
71
+    _lsmod)             shellfu-get lsmod ;;
72
     _ffrun)             ffrun "$@" ;;
72
     _ffrun)             ffrun "$@" ;;
73
     *)                  saturnin_runsc "$@" ;;
73
     *)                  saturnin_runsc "$@" ;;
74
 esac
74
 esac

src/ffoo/saturnin_meta.sh → src/shellfu/saturnin_meta.sh View File

1
 #!/bin/bash
1
 #!/bin/bash
2
 
2
 
3
-ffoo import exit
4
-ffoo import inigrep
5
-ffoo import pretty
3
+shellfu import exit
4
+shellfu import inigrep
5
+shellfu import pretty
6
 
6
 
7
 saturnin_help() {
7
 saturnin_help() {
8
     {
8
     {
14
         saturnin_lssc \
14
         saturnin_lssc \
15
           | sed -e 's/^/    /'
15
           | sed -e 's/^/    /'
16
     } | mkhelp -E -f -
16
     } | mkhelp -E -f -
17
-    return "$FFOO_EXIT_OK"
17
+    return "$SHELLFU_EXIT_OK"
18
 }
18
 }
19
 
19
 
20
 saturnin_lssc() {
20
 saturnin_lssc() {
54
     test -x "$lexpath" || {
54
     test -x "$lexpath" || {
55
         warn "invalid sub-command: $SATURNIN_SUBCOMMAND"
55
         warn "invalid sub-command: $SATURNIN_SUBCOMMAND"
56
         saturnin_help
56
         saturnin_help
57
-        return "$FFOO_EXIT_USAGE"
57
+        return "$SHELLFU_EXIT_USAGE"
58
     }
58
     }
59
     "$lexpath" "$@"
59
     "$lexpath" "$@"
60
 }
60
 }