Browse Source

split off bmo: Rewrite non-moving parts

Alois Mahdal 8 years ago
parent
commit
c38aa98d9a
7 changed files with 25 additions and 35 deletions
  1. 1
    1
      .gitignore
  2. 1
    1
      Makefile
  3. 15
    25
      mkit.ini
  4. 3
    3
      src/complete.bash
  5. 1
    1
      tests/TF_HEADER
  6. 1
    1
      tests/cli/TF_RUN
  7. 3
    3
      tests/cli/oracle/usage.stderr

+ 1
- 1
.gitignore View File

@@ -1,3 +1,3 @@
1 1
 .mkit/autoclean
2
-saturnin-*.tar.gz
2
+satcmd-*.tar.gz
3 3
 tfkit-artifacts

+ 1
- 1
Makefile View File

@@ -1,4 +1,4 @@
1
-# saturnin - Smart and ready desktop helper
1
+# satcmd - A Saturnin template command
2 2
 # See LICENSE file for copyright and license details.
3 3
 
4 4
 include config.mk

+ 15
- 25
mkit.ini View File

@@ -1,8 +1,8 @@
1 1
 
2 2
 [ENV]
3 3
 
4
-    PKGNAME = saturnin
5
-    PROJNAME = Saturnin
4
+    PKGNAME = satcmd
5
+    PROJNAME = SATCMD
6 6
     PREFIX = /usr
7 7
 
8 8
 [lists]
@@ -27,37 +27,27 @@
27 27
 
28 28
 [roots]
29 29
     bin     = [ENV:PREFIX]/bin
30
-    libexec = [ENV:PREFIX]/libexec/saturnin
31
-    share   = [ENV:PREFIX]/share/saturnin
32
-    etc     = /etc/saturnin
30
+    libexec = [ENV:PREFIX]/libexec/satcmd
31
+    share   = [ENV:PREFIX]/share/satcmd
32
+    etc     = /etc/satcmd
33 33
     etc_bc  = /etc/bash_completion.d
34 34
 
35 35
 [vars]
36
-    __SATURNIN_CACHE_HOME__     = $HOME/.local/share/saturnin
37
-    __SATURNIN_CONFIG_USER__    = $HOME/.saturnin
38
-    __SATURNIN_CONFIG_LOCAL__   = [roots:etc]
39
-    __SATURNIN_LIBEXEC__        = [roots:libexec]
40
-    __SATURNIN_SHARE__          = [roots:share]
41
-    __SATURNIN_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_FFOO_DIR__       = [roots:share]/ffoo
42 42
 
43 43
 [files:bin]
44
-    src/bin/saturnin                        = saturnin
44
+    src/bin/satcmd              = satcmd
45 45
 
46 46
 [files:etc_bc]
47
-    src/complete.bash                       = saturnin.bash
47
+    src/complete.bash           = satcmd.bash
48 48
 
49 49
 [files:libexec]
50
-    src/libexec/saturnin-au                 = saturnin-au
51
-    src/libexec/saturnin-clip               = saturnin-clip
52
-    src/libexec/saturnin-dmenu              = saturnin-dmenu
53
-    src/libexec/saturnin-iam                = saturnin-iam
54
-    src/libexec/saturnin-kb                 = saturnin-kb
55
-    src/libexec/saturnin-ln                 = saturnin-ln
56
-    src/libexec/saturnin-menu               = saturnin-menu
57
-    src/libexec/saturnin-uris               = saturnin-uris
58
-    src/libexec/saturnin-xuris              = saturnin-xuris
50
+    src/libexec/satcmd-echo     = satcmd-echo
59 51
 
60 52
 [files:share]
61
-    src/ffoo/saturnin_meta.sh               = ffoo/saturnin_meta.sh
62
-    src/ffoo/saturnin_urimagic.sh           = ffoo/saturnin_urimagic.sh
63
-    src/ffoo/saturnin_zleep.sh              = ffoo/saturnin_zleep.sh
53
+    src/ffoo/saturnin_meta.sh   = ffoo/saturnin_meta.sh

+ 3
- 3
src/complete.bash View File

@@ -1,5 +1,5 @@
1 1
 
2
-__saturnin() {
2
+__satcmd() {
3 3
     local cur prev opts
4 4
     COMPREPLY=()
5 5
     cur="${COMP_WORDS[COMP_CWORD]}"
@@ -14,9 +14,9 @@ __saturnin() {
14 14
             ;;
15 15
         *)
16 16
             COMPREPLY=(
17
-                $(compgen -W "$(saturnin _ls_subcommands)" ${cur})
17
+                $(compgen -W "$(satcmd _ls_subcommands)" ${cur})
18 18
             )
19 19
     esac
20 20
 }
21 21
 
22
-complete -F __saturnin saturnin
22
+complete -F __satcmd satcmd

+ 1
- 1
tests/TF_HEADER View File

@@ -1,3 +1,3 @@
1 1
 #!/bin/sh
2 2
 
3
-echo "version: $(saturnin --version-semver)"
3
+echo "version: $(satcmd --version-semver)"

+ 1
- 1
tests/cli/TF_RUN View File

@@ -13,7 +13,7 @@ tf_name2cmd() {
13 13
     local o_err="oracle/$name.stderr"
14 14
     local o_es=0
15 15
     case $name in
16
-        usage)       cmd="saturnin"; o_es=2 ;;
16
+        usage)       cmd="satcmd"; o_es=2 ;;
17 17
     esac
18 18
     echo "tf_testflt -n $name -E $o_err -S $o_es $cmd"
19 19
 }

+ 3
- 3
tests/cli/oracle/usage.stderr View File

@@ -1,3 +1,3 @@
1
-usage: saturnin [-d|-v] command [args...]
2
-usage: saturnin help
3
-usage: saturnin --version
1
+usage: satcmd [-d|-v] command [args...]
2
+usage: satcmd help
3
+usage: satcmd --version