Update for ffoo-0.0.16

bin/saturnin.skel

@@ -3,9 +3,9 @@
 . <(ffoom init)
 
 mkinipath() {
-    local userd="__SATURNIN_INI_USER__/ini.d"
-    local user="__SATURNIN_INI_USER__"
-    local lcal="__SATURNIN_INI_LOCAL__"
+    local userd="__SATURNIN_CONFIG_USER__/ini.d"
+    local user="__SATURNIN_CONFIG_USER__"
+    local lcal="__SATURNIN_CONFIG_LOCAL__"
     local distd="__SATURNIN_SHARE__/ini.d"
     test -d "$userd" && find "$userd" -mindepth 1 -maxdepth 1 -type d
     echo "$user"
@@ -15,7 +15,8 @@ mkinipath() {
 
 export FFOO_PATH="__SATURNIN_SHARE__/ffoo"
 SATURNIN_LIBEXEC="__SATURNIN_LIBEXEC__"
-export FFOO_INI_PATH=$(mkinipath | tr '\n' :)
+export FFOO_CONFIG_PATH=$(mkinipath | tr '\n' :)
+export FFOO_CONFIG_SUFFIX=".ini"
 
 ffoo import exit
 ffoo import core
@@ -42,7 +43,7 @@ while true; do case $1 in
     *)              break;                          ;;
 esac done
 
-debug -v FFOO_PATH SATURNIN_LIBEXEC FFOO_INI_PATH
+debug -v FFOO_PATH SATURNIN_LIBEXEC FFOO_CONFIG_PATH
 debug "\$@=$@"
 
 scmd=$1

config.mk

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

ffoo/www.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 ffoo import core
-ffoo import ini
+ffoo import config
 
 
 filter_exprs() {
@@ -123,11 +123,11 @@ kw2uri() {
         debug -v kw query
         if test -n "$query";
         then
-            local fmt=$(iniread -1 -p www.query.$kw)
+            local fmt=$(cfgrep -1 -p www.query.$kw)
             debug -v fmt
             printf "$fmt\n" "$query"
         else
-            iniread -1 -p www.bookmark.$kw
+            cfgrep -1 -p www.bookmark.$kw
         fi
     done
 }

libexec/saturnin-ini

@@ -2,9 +2,9 @@
 
 . <(ffoom init)
 
+ffoo import config
 ffoo import core
-ffoo import ini
 
 debug "\$@=$@"
 
-iniread "$@"
+cfgrep "$@"

libexec/saturnin-www

@@ -2,7 +2,8 @@
 
 . <(ffoom init)
 
-ffoo import ini
+ffoo import config
+ffoo import core
 ffoo import www
 ffoo import xorg
 
@@ -10,6 +11,6 @@ debug "\$@=$@"
 
 test -z "$uri" && uri="$(echo "$@" | find_uri)"
 test -z "$uri" && uri="$(clipln | find_uri)"
-test -z "$uri" && uri="$(iniread -p www.bookmark.default)"
+test -z "$uri" && uri="$(cfgrep -p www.bookmark.default)"
 
 echo "$uri"

setup/mk.sh

@@ -127,8 +127,8 @@ expand_variables() {
     # Expand variable values
     #
     perl -pe "
-        s|__SATURNIN_INI_LOCAL__|$SATURNIN_INI_PATH_LOCAL|;
-        s|__SATURNIN_INI_USER__|\\\$HOME/$SATURNIN_INI_PATH_USER|;
+        s|__SATURNIN_CONFIG_LOCAL__|$SATURNIN_CONFIG_PATH_LOCAL|;
+        s|__SATURNIN_CONFIG_USER__|\\\$HOME/$SATURNIN_CONFIG_PATH_USER|;
         s|__SATURNIN_SHARE__|$shrdir|;
         s|__SATURNIN_LIBEXEC__|$lexdir|;
         s|__VERSION__|$(get_version)|;