|
@@ -17,7 +17,7 @@ inigrep_modules() {
|
17
|
17
|
|
18
|
18
|
inigrep_paths() {
|
19
|
19
|
#
|
20
|
|
- # Assemble list of config paths for FFOO_CONFIG_PATH (path per line)
|
|
20
|
+ # Assemble list of config paths for FFOO_INIGREP_PATH (path per line)
|
21
|
21
|
#
|
22
|
22
|
local userd # user'd modular config (~/.xyz/ini.d)
|
23
|
23
|
local user # user's generic config
|
|
@@ -33,10 +33,10 @@ inigrep_paths() {
|
33
|
33
|
inigrep_modules "$distd"
|
34
|
34
|
}
|
35
|
35
|
|
36
|
|
-export FFOO_CONFIG_PATH FFOO_PATH FFOO_PRETTY_USAGE \
|
|
36
|
+export FFOO_INIGREP_PATH FFOO_PATH FFOO_PRETTY_USAGE \
|
37
|
37
|
SATURNIN_VERSION SATURNIN_CACHE_HOME
|
38
|
38
|
|
39
|
|
-FFOO_CONFIG_PATH="$(inigrep_paths | tr '\n' :)"
|
|
39
|
+FFOO_INIGREP_PATH="$(inigrep_paths | tr '\n' :)"
|
40
|
40
|
FFOO_PATH="__SATURNIN_FFOO_DIR__"
|
41
|
41
|
FFOO_PRETTY_USAGE="subcommand"
|
42
|
42
|
SATURNIN_CACHE_HOME="__SATURNIN_CACHE_HOME__"
|
|
@@ -47,8 +47,8 @@ SATURNIN_VERSION="__VERSION__"
|
47
|
47
|
# =====END BUILT PART=====
|
48
|
48
|
#
|
49
|
49
|
|
50
|
|
-ffoo import config
|
51
|
50
|
ffoo import exit
|
|
51
|
+ffoo import inigrep
|
52
|
52
|
ffoo import pretty
|
53
|
53
|
|
54
|
54
|
usage() {
|
|
@@ -119,7 +119,7 @@ while true; do case $1 in
|
119
|
119
|
*) break; ;;
|
120
|
120
|
esac done
|
121
|
121
|
|
122
|
|
-debug -v FFOO_PATH SATURNIN_LIBEXEC FFOO_CONFIG_PATH
|
|
122
|
+debug -v FFOO_PATH SATURNIN_LIBEXEC FFOO_INIGREP_PATH
|
123
|
123
|
debug "\$*='$*'"
|
124
|
124
|
|
125
|
125
|
export SATURNIN_SUBCOMMAND="$1"
|