Revamp FFOO_INI_PATH logic

Config files can now be merged from 4 sources:  distribution-provided,
(share folder), local (/etc/saturnin), user-specific (~/.saturnin and
~/saturnin/ini.d/*)

bin/saturnin.skel

@@ -1,9 +1,21 @@
 #!/bin/bash
 
 . <(ffoom init)
-export FFOO_INI_PATH="$SATURNIN_INI_PATH:__SATURNIN_INI_PATH__"
-export FFOO_PATH="__SATURNIN_FFOO_PATH__"
-saturnin_libexec="__SATURNIN_LIBEXEC__"
+
+mkinipath() {
+    local userd="__SATURNIN_INI_USER__/ini.d"
+    local user="__SATURNIN_INI_USER__"
+    local lcal="__SATURNIN_INI_LOCAL__"
+    local distd="__SATURNIN_SHARE__/ini.d"
+    test -d "$userd" && find "$userd" -mindepth 1 -maxdepth 1 -type d
+    echo "$user"
+    echo "$lcal"
+    test -d "$distd" && find "$distd" -mindepth 1 -maxdepth 1 -type d
+}
+
+export FFOO_PATH="__SATURNIN_SHARE__/ffoo"
+SATURNIN_LIBEXEC="__SATURNIN_LIBEXEC__"
+export FFOO_INI_PATH=$(mkinipath | tr '\n' :)
 
 ffoo import exit
 ffoo import core
@@ -16,7 +28,7 @@ usage() {
 print_help() {
     echo "valid commands:"
     echo ""
-    ls "$saturnin_libexec" \
+    ls "$SATURNIN_LIBEXEC" \
       | sed -e 's/saturnin-/    /'
 }
 
@@ -30,6 +42,7 @@ while true; do case $1 in
     *)              break;                          ;;
 esac done
 
+debug -v FFOO_PATH SATURNIN_LIBEXEC FFOO_INI_PATH
 debug "\$@=$@"
 
 scmd=$1
@@ -38,7 +51,7 @@ shift
 case $scmd in
     help)  print_help; exit $FFOO_EXIT_OK ;;
     *)
-        lexpath="$saturnin_libexec/saturnin-$scmd"
+        lexpath="$SATURNIN_LIBEXEC/saturnin-$scmd"
         debug -v lexpath
         debug "\$@='$@'"
         test -x "$lexpath" && exec "$lexpath" "$@"

config.mk

@@ -3,5 +3,5 @@ VERSION = 0.0.0
 STAGE = devel
 PREFIX = /usr/local
 MANPREFIX = ${PREFIX}/share/man
-SATURNIN_INI_PATH_GLOBAL = /etc/saturnin
+SATURNIN_INI_PATH_LOCAL = /etc/saturnin
 SATURNIN_INI_PATH_USER = .saturnin

setup/mk.sh

@@ -8,7 +8,7 @@ sed -e 's/ = /=/' < config.mk > $tmp
 rm -f $tmp
 
 bindir=${DESTDIR}${PREFIX}/bin
-shrdir=${DESTDIR}${PREFIX}/share/saturnin/ffoo
+shrdir=${DESTDIR}${PREFIX}/share/saturnin
 lexdir=${DESTDIR}${PREFIX}/libexec/saturnin
 
 list_of_bins() {
@@ -127,18 +127,20 @@ expand_variables() {
     # Expand variable values
     #
     perl -pe "
-        s|__SATURNIN_INI_PATH__|$SATURNIN_INI_PATH_GLOBAL:\\\$HOME/$SATURNIN_INI_PATH_USER|;
-        s|__SATURNIN_FFOO_PATH__|$shrdir|;
+        s|__SATURNIN_INI_LOCAL__|$SATURNIN_INI_PATH_LOCAL|;
+        s|__SATURNIN_INI_USER__|\\\$HOME/$SATURNIN_INI_PATH_USER|;
+        s|__SATURNIN_SHARE__|$shrdir|;
         s|__SATURNIN_LIBEXEC__|$lexdir|;
         s|__VERSION__|$(get_version)|;
     "
 }
+
 install() {
     mkdir -vp $bindir \
-              $shrdir \
+              $shrdir/ffoo \
               $lexdir
     list_of_bins | xargs cp -vrt $bindir
-    list_of_shrs | xargs cp -vrt $shrdir
+    list_of_shrs | xargs cp -vrt $shrdir/ffoo
     list_of_lexs | xargs cp -vrt $lexdir
     list_of_installed_bins | xargs chmod -v 755
     list_of_installed_lexs | xargs chmod -v 755