瀏覽代碼

Move saturnin-conf to built-in

Alois Mahdal 10 年之前
父節點
當前提交
dfd3810eee
共有 3 個檔案被更改,包括 8 行新增12 行删除
  1. 0
    1
      mkit/config.ini
  2. 8
    1
      src/bin/saturnin.skel
  3. 0
    10
      src/libexec/saturnin-conf

+ 0
- 1
mkit/config.ini 查看文件

@@ -46,7 +46,6 @@
46 46
     src/libexec/saturnin-clip               = saturnin-clip
47 47
     src/libexec/saturnin-dmenu              = saturnin-dmenu
48 48
     src/libexec/saturnin-iam                = saturnin-iam
49
-    src/libexec/saturnin-conf               = saturnin-conf
50 49
     src/libexec/saturnin-ip                 = saturnin-ip
51 50
     src/libexec/saturnin-kb                 = saturnin-kb
52 51
     src/libexec/saturnin-ln                 = saturnin-ln

+ 8
- 1
src/bin/saturnin.skel 查看文件

@@ -19,6 +19,7 @@ export FFOO_CONFIG_PATH=$(mkconfpath | tr '\n' :)
19 19
 export SATURNIN_VERSION="__VERSION__"
20 20
 export SATURNIN_CACHE_HOME="__SATURNIN_CACHE_HOME__"
21 21
 
22
+ffoo import config
22 23
 ffoo import exits
23 24
 ffoo import pretty
24 25
 
@@ -30,7 +31,12 @@ usage() {
30 31
 
31 32
 print_help() {
32 33
     echo ""
33
-    echo "valid sub-commands:"
34
+    echo "built-in sub-commands:"
35
+    echo ""
36
+    echo "    conf"
37
+    echo "    help"
38
+    echo ""
39
+    echo "installed sub-commands:"
34 40
     echo ""
35 41
     find "$SATURNIN_LIBEXEC" \
36 42
         -mindepth 1 \
@@ -65,6 +71,7 @@ SATURNIN_SUBCOMMAND="$1"
65 71
 shift
66 72
 
67 73
 case "$SATURNIN_SUBCOMMAND" in
74
+    conf)   inigrep "$@"; exit $? ;;
68 75
     help)  print_help; exit $FFOO_EXIT_OK ;;
69 76
     *)
70 77
         lexpath="$SATURNIN_LIBEXEC/saturnin-$SATURNIN_SUBCOMMAND"

+ 0
- 10
src/libexec/saturnin-conf 查看文件

@@ -1,10 +0,0 @@
1
-#!/bin/bash
2
-
3
-. $(ffoom path)
4
-
5
-ffoo import pretty
6
-ffoo import config
7
-
8
-debug "\$@=$@"
9
-
10
-inigrep "$@"