Bläddra i källkod

Remove app name infix from tokens

Turns out this is not good practice; the tokens are only used within the
process of building the application so there's no need to qualify them.
Having them qualified in fact adds unnecessary spam when syncing with
the template.
Alois Mahdal 7 år sedan
förälder
incheckning
61880b8178
2 ändrade filer med 11 tillägg och 11 borttagningar
  1. 5
    5
      mkit.ini
  2. 6
    6
      src/bin/app.skel

+ 5
- 5
mkit.ini Visa fil

@@ -30,11 +30,11 @@
30 30
     etc_bc  = /etc/bash_completion.d
31 31
 
32 32
 [tokens]
33
-    __SATURNIN_DEMO_CACHE_HOME__     = $HOME/.cache/saturnin-demo
34
-    __SATURNIN_DEMO_CONFIG_USER__    = $HOME/.saturnin-demo
35
-    __SATURNIN_DEMO_CONFIG_LOCAL__   = [roots:etc]
36
-    __SATURNIN_DEMO_LIBEXEC__        = [roots:libexec]
37
-    __SATURNIN_DEMO_SHARE__          = [roots:share]
33
+    __SATURNIN_CACHE_HOME__     = $HOME/.cache/saturnin-demo
34
+    __SATURNIN_CONFIG_USER__    = $HOME/.saturnin-demo
35
+    __SATURNIN_CONFIG_LOCAL__   = [roots:etc]
36
+    __SATURNIN_LIBEXEC__        = [roots:libexec]
37
+    __SATURNIN_SHARE__          = [roots:share]
38 38
 
39 39
 [modes]
40 40
     bin     = 755

+ 6
- 6
src/bin/app.skel Visa fil

@@ -12,8 +12,8 @@
12 12
     SATURNIN_APP_TAGLINE="__MKIT_PROJ_TAGLINE__"
13 13
     SATURNIN_APP_VERSION="__MKIT_PROJ_VERSION__"
14 14
     SATURNIN_APP_GIT_HASH="__MKIT_PROJ_GIT_LASTHASH__"
15
-    SATURNIN_CACHE_HOME="__SATURNIN_DEMO_CACHE_HOME__"
16
-    SATURNIN_LIBEXEC="__SATURNIN_DEMO_LIBEXEC__"
15
+    SATURNIN_CACHE_HOME="__SATURNIN_CACHE_HOME__"
16
+    SATURNIN_LIBEXEC="__SATURNIN_LIBEXEC__"
17 17
     SATURNIN_LIBEXEC_PREFIX="__MKIT_PROJ_PKGNAME__-"
18 18
     PRETTY_USAGE="subcommand"
19 19
 }
@@ -22,10 +22,10 @@ shellfu import saturnin
22 22
 
23 23
 SATURNIN_CONF_PATH="$(
24 24
     saturnin__conf_mkpath \
25
-        __SATURNIN_DEMO_CONFIG_USER__/ini.d \
26
-        __SATURNIN_DEMO_CONFIG_USER__ \
27
-        __SATURNIN_DEMO_CONFIG_LOCAL__ \
28
-        __SATURNIN_DEMO_SHARE__/ini.d
25
+        __SATURNIN_CONFIG_USER__/ini.d \
26
+        __SATURNIN_CONFIG_USER__ \
27
+        __SATURNIN_CONFIG_LOCAL__ \
28
+        __SATURNIN_SHARE__/ini.d
29 29
 )"
30 30
 
31 31
 #