Get rid of "ini" notation

bin/saturnin.skel

@@ -2,11 +2,11 @@
 
 . <(ffoom init)
 
-mkinipath() {
-    local userd="__SATURNIN_CONFIG_USER__/ini.d"
+mkconfpath() {
+    local userd="__SATURNIN_CONFIG_USER__/conf.d"
     local user="__SATURNIN_CONFIG_USER__"
     local lcal="__SATURNIN_CONFIG_LOCAL__"
-    local distd="__SATURNIN_SHARE__/ini.d"
+    local distd="__SATURNIN_SHARE__/conf.d"
     test -d "$userd" && find "$userd" -mindepth 1 -maxdepth 1 -type d
     echo "$user"
     echo "$lcal"
@@ -15,11 +15,10 @@ mkinipath() {
 
 export FFOO_PATH="__SATURNIN_SHARE__/ffoo"
 SATURNIN_LIBEXEC="__SATURNIN_LIBEXEC__"
-export FFOO_CONFIG_PATH=$(mkinipath | tr '\n' :)
-export FFOO_CONFIG_SUFFIX=".ini"
+export FFOO_CONFIG_PATH=$(mkconfpath | tr '\n' :)
 export SATURNIN_VERSION="__VERSION__"
 
-ffoo import exit
+ffoo import exits
 ffoo import core
 
 usage() {

libexec/saturnin-dmenu

@@ -20,11 +20,11 @@ esac done
 
 test -n "$delim"        && maybe_split=do_split
 
-nb="$(saturnin ini -p style.color.nbg)"
-nf="$(saturnin ini -p style.color.nfg)"
-sb="$(saturnin ini -p style.color.sbg)"
-sf="$(saturnin ini -p style.color.sfg)"
-fn="$(saturnin ini -p style.font)"
+nb="$(saturnin conf -p style.color.nbg)"
+nf="$(saturnin conf -p style.color.nfg)"
+sb="$(saturnin conf -p style.color.sbg)"
+sf="$(saturnin conf -p style.color.sfg)"
+fn="$(saturnin conf -p style.font)"
 fn=${fn:--*-terminus-medium-r-*-*-16-*-*-*-*-*-*-*}
 
 debug -v nb nf sb sf fn

libexec/saturnin-iam

@@ -45,26 +45,26 @@ familiars_at() {
     # daemons specific to $1 location plus the rest
     #
     test -n "$1" || usagef "location"
-    saturnin ini -p iam.running.at.$1
-    saturnin ini -p iam.running.at.ANYPLACE
+    saturnin conf -p iam.running.at.$1
+    saturnin conf -p iam.running.at.ANYPLACE
 }
 
 where_i_am() {
     #
     # what is my physical location?
     #
-    if=$(saturnin ini -p iam.using.if)
+    if=$(saturnin conf -p iam.using.if)
     gwmac=$(arp | grep "^gateway\\>.*\\<$if\$" | tr ' ' '\n' | grep :)
-    saturnin ini -p iam.seeing.gw.$gwmac || echo OUT
+    saturnin conf -p iam.seeing.gw.$gwmac || echo OUT
 }
 
 start_familiar() {
     #
-    # start familiar as indicated by ini file (unless running)
+    # start familiar as indicated by conf file (unless running)
     #
     local f=$1
     pids_matching $f && return 0
-    local like=$(saturnin ini -p iam.starting.like.this.$f)
+    local like=$(saturnin conf -p iam.starting.like.this.$f)
     debug -v f like
     if test -n  "$like";
         then
@@ -75,10 +75,10 @@ start_familiar() {
 
 set_status() {
     #
-    # set public status $1 by command in ini file
+    # set public status $1 by command in conf file
     #
     local what=$1
-    saturnin ini -p iam.saying.like.this.$what | bash
+    saturnin conf -p iam.saying.like.this.$what | bash
 }
 
 sound_is_muted() {
@@ -137,8 +137,8 @@ i_am_bbl() {
     # changing language
     #
     local cur=$(setxkbmap -v | grep '^symbols: ' | cut -d+ -f2)
-    local all="$(saturnin ini    -p iam.typing.lang)"
-    local def="$(saturnin ini -1 -p iam.typing.lang)"
+    local all="$(saturnin conf    -p iam.typing.lang)"
+    local def="$(saturnin conf -1 -p iam.typing.lang)"
     local nxt=$(
         echo -e "$all\n$all" \
           | grep -m 1 -A 1 $cur \
@@ -154,7 +154,7 @@ i_am_bbldone() {
     #
     # changing language back to normal
     #
-    setxkbmap "$(saturnin ini -1 -p iam.typing.lang)"
+    setxkbmap "$(saturnin conf -1 -p iam.typing.lang)"
 }
 
 i_am_deaf() {

libexec/saturnin-ln

@@ -38,7 +38,7 @@ link() {
 }
 
 load() {
-    saturnin ini -p ln.dir.$1 | expand_tilde | debug_pipe out
+    saturnin conf -p ln.dir.$1 | expand_tilde | debug_pipe out
 }
 
 while true; do case $1 in
@@ -53,7 +53,7 @@ test -z "$prefix"               && prefix=$(load prefix)
 test -z "$target"               && target=$DEFAULT_TARGET
 
 case $prefix.$name in
-    .)          die "provide at least name or set prefix in ln.ini";;
+    .)          die "provide at least name or set prefix in ln.conf";;
     $prefix.)   name=$prefix;;
     .$name)     :;;
     *)          name=$prefix.$name;;

libexec/saturnin-push

@@ -5,7 +5,7 @@
 ffoo import core
 ffoo import recon
 
-ORDER="$(saturnin ini -p push.options.order)"
+ORDER="$(saturnin conf -p push.options.order)"
 
 usage() {
     usage_is "[-o|--order path:host|host:path] host..."
@@ -19,11 +19,11 @@ while true; do case $1 in
     *)              hosts="$1"; shift ;;
 esac done
 
-test -n "$hosts" || hosts=$(saturnin ini -s push.hosts | debug_pipe ini_hosts)
+test -n "$hosts" || hosts=$(saturnin conf -s push.hosts | debug_pipe ini_hosts)
 debug -v hosts
 
 test -n "$hosts" || die "no valid hosts to begin with"
-paths=$(saturnin ini -s push.paths)
+paths=$(saturnin conf -s push.paths)
 test -n "$paths" || die "no valid paths to begin with"
 
 think "Probing & sorting paths"
@@ -55,7 +55,7 @@ case "$ORDER" in
             do
                 if rsync -L -r --delete $path $host:
                 then
-                    think $(collapse_tilde <<<"$path") sent to $host
+                    think "$(collapse_tilde <<<"$path") sent to $host"
                 fi
             done
         done
@@ -68,7 +68,7 @@ case "$ORDER" in
             do
                 if rsync -L -r --delete $path $host:
                 then
-                    think $host got $path
+                    think "$host got $path"
                 fi
             done
         done
@@ -81,7 +81,7 @@ esac
 
 for host in $hosts;
 do
-    saturnin ini -s push.commands \
+    saturnin conf -s push.commands \
       | grep . \
       | while read cmd;
         do

libexec/saturnin-revert

@@ -41,12 +41,12 @@ domain="$1"
 snapshot="$2"
 
 test -z "$snapshot" && {
-    think "looking for $domain in revert.ini"
-    snapshot=$(saturnin ini -1 -p revert.to.snapshot.$domain)
+    think "looking for $domain in revert.conf"
+    snapshot=$(saturnin conf -1 -p revert.to.snapshot.$domain)
 }
 test -z "$snapshot" && {
-    think "looking for default snapshot name in revert.ini"
-    snapshot=$(saturnin ini -1 -p revert.to.snapshot._default_)
+    think "looking for default snapshot name in revert.conf"
+    snapshot=$(saturnin conf -1 -p revert.to.snapshot._default_)
 }
 test -z "$snapshot" && {
     die "could not determine snapshot for $domain"

setup/mk.sh

@@ -19,7 +19,7 @@ list_of_lexs() {
     echo libexec/saturnin-czrates
     echo libexec/saturnin-dmenu
     echo libexec/saturnin-iam
-    echo libexec/saturnin-ini
+    echo libexec/saturnin-conf
     echo libexec/saturnin-ip
     echo libexec/saturnin-ln
     echo libexec/saturnin-push