Browse Source

Update for Saturnin v0.5.0+

Alois Mahdal 5 years ago
parent
commit
4874dab20c
2 changed files with 26 additions and 29 deletions
  1. 3
    2
      mkit.ini
  2. 23
    27
      src/app.skel

+ 3
- 2
mkit.ini View File

@@ -37,13 +37,14 @@
37 37
     __SATURNIN_DATA_HOME__    = [ENV:XDG_DATA_HOME]/dottum
38 38
     __SATURNIN_CACHE_HOME__   = [ENV:XDG_CACHE_HOME]/dottum
39 39
     __SATURNIN_CONFIG_HOME__  = [ENV:XDG_CONFIG_HOME]/dottum
40
+    __SATURNIN_BUILTINS__     = conf
40 41
     __SATURNIN_CONFIG_LOCAL__ = [roots:etc]
41 42
     __SATURNIN_LIBEXEC__      = [roots:libexec]
42 43
     __SATURNIN_SHARE__        = [roots:share]
43 44
     __VDEP_SHELLFU_GE__  = 0.10.10
44 45
     __VDEP_SHELLFU_LT__  = 0.11.0
45
-    __VDEP_SATURNIN_GE__ = 0.4.13
46
-    __VDEP_SATURNIN_LT__ = 0.5.0
46
+    __VDEP_SATURNIN_GE__ = 0.5.0
47
+    __VDEP_SATURNIN_LT__ = 0.6.0
47 48
 
48 49
 [modes]
49 50
     bin     = 755

+ 23
- 27
src/app.skel View File

@@ -3,32 +3,28 @@
3 3
 
4 4
 . "$(sfpath)" || exit 3
5 5
 
6
-{
7
-    SATURNIN_APP_CODENAME="__MKIT_PROJ_CODENAME__"
8
-    SATURNIN_APP_TAGLINE="__MKIT_PROJ_TAGLINE__"
9
-    SATURNIN_APP_VERSION="__MKIT_PROJ_VERSION__"
10
-    SATURNIN_APP_GIT_HASH="__MKIT_PROJ_GIT_LASTHASH__"
11
-    SATURNIN_CACHE_HOME=${SATURNIN_CACHE_HOME:-"__SATURNIN_CACHE_HOME__"}
12
-    SATURNIN_CONFIG_HOME=${SATURNIN_CONFIG_HOME:-"__SATURNIN_CONFIG_HOME__"}
13
-    SATURNIN_DATA_HOME=${SATURNIN_DATA_HOME:-"__SATURNIN_DATA_HOME__"}
14
-    SATURNIN_META_HELP=${SATURNIN_META_HELP:-"+__SATURNIN_SHARE__/help"}
15
-    SATURNIN_LIBEXEC=${SATURNIN_LIBEXEC:-"__SATURNIN_LIBEXEC__"}
16
-    SATURNIN_LIBEXEC_PREFIX="__MKIT_PROJ_PKGNAME__-"
17
-    PRETTY_USAGE="subcommand"
18
-    PRETTY_DEBUG_EXCLUDE="$PRETTY_DEBUG_EXCLUDE,inigrep,saturnin"
19
-}
20
-
21 6
 shellfu import saturnin
22 7
 
23
-test -n "$SATURNIN_CONF_PATH" || SATURNIN_CONF_PATH="$(
24
-    saturnin__conf_mkpath \
25
-        "__SATURNIN_CONFIG_HOME__/ini.d" \
26
-        "__SATURNIN_CONFIG_HOME__" \
27
-        "__SATURNIN_CONFIG_LOCAL__" \
28
-        "__SATURNIN_SHARE__/ini.d"
29
-)"
30
-
31
-export SATURNIN_CONF_PATH SHELLFU_PATH PRETTY_USAGE PRETTY_DEBUG_EXCLUDE \
32
-       SATURNIN_CACHE_HOME SATURNIN_CONFIG_HOME SATURNIN_DATA_HOME
33
-
34
-saturnin__main "$@"
8
+saturnin__main \
9
+    --saturnin-app-codename "__MKIT_PROJ_CODENAME__" \
10
+    --saturnin-app-git-hash "__MKIT_PROJ_GIT_LASTHASH__" \
11
+    --saturnin-app-tagline "__MKIT_PROJ_TAGLINE__" \
12
+    --saturnin-app-version "__MKIT_PROJ_VERSION__" \
13
+    --saturnin-builtins "__SATURNIN_BUILTINS__" \
14
+    --saturnin-cache-home "__SATURNIN_CACHE_HOME__" \
15
+    --saturnin-config-home "__SATURNIN_CONFIG_HOME__" \
16
+    --saturnin-data-home "__SATURNIN_DATA_HOME__" \
17
+    --saturnin-conf-path "$(
18
+        saturnin__conf_mkpath \
19
+            "__SATURNIN_CONFIG_HOME__/ini.d" \
20
+            "__SATURNIN_CONFIG_HOME__" \
21
+            "__SATURNIN_CONFIG_LOCAL__" \
22
+            "__SATURNIN_SHARE__/ini.d"
23
+    )" \
24
+    --saturnin-conf-suffix ".ini" \
25
+    --saturnin-help-topicpath "__SATURNIN_HELP_TOPICPATH__" \
26
+    --saturnin-help-topicsuffix ".md" \
27
+    --saturnin-libexec "__SATURNIN_LIBEXEC__" \
28
+    --saturnin-libexec-prefix "__MKIT_PROJ_PKGNAME__-" \
29
+    --saturnin-meta-help "+__SATURNIN_SHARE__/help" \
30
+    "$@"