Use eeini instead of ini.iniread directly

Avoids need to replace __EECC_INI__PATH

bin/eedmenu.in

@@ -2,9 +2,6 @@
 
 . <(ffoom init)
 ffoo import core
-ffoo import ini
-
-FFOO_INI_PATH="__EECC_INI_PATH__"
 
 usage() {
     usage_is "[-l|--lines NUM] [--split CHAR] ARGS..."
@@ -23,11 +20,11 @@ esac done
 
 test -n "$delim"        && maybe_split=do_split
 
-nb="$(iniread -p style.color.nbg)"
-nf="$(iniread -p style.color.nfg)"
-sb="$(iniread -p style.color.sbg)"
-sf="$(iniread -p style.color.sfg)"
-fn="$(iniread -p style.font)"
+nb="$(eeini -p style.color.nbg)"
+nf="$(eeini -p style.color.nfg)"
+sb="$(eeini -p style.color.sbg)"
+sf="$(eeini -p style.color.sfg)"
+fn="$(eeini -p style.font)"
 fn=${fn:--*-terminus-medium-r-*-*-16-*-*-*-*-*-*-*}
 
 debug -v nb nf sb sf fn

bin/eeget.in

@@ -1,7 +1,6 @@
 #!/bin/bash
 
 . <(ffoom init)
-FFOO_INI_PATH="__EECC_INI_PATH__"
 
 ffoo import core
 ffoo import ini
@@ -21,7 +20,7 @@ while true; do case $1 in
     *)              nvrlist=$1;         shift;   break  ;;
 esac done
 
-test -n "$brewroot" || brewroot=$(iniread -p get.brewroot)
+test -n "$brewroot" || brewroot=$(eeini -p get.brewroot)
 test -n "$brewroot" || die "specify '-b /path/to/brewroot or get.brewroot in get.ini"
 test -d "$brewroot" || die "cannot access brewroot: $brewroot"
 

bin/eeiam.in

@@ -1,10 +1,8 @@
 #!/bin/bash
 
 . <(ffoom init)
-FFOO_INI_PATH="__EECC_INI_PATH__"
 
 ffoo import core
-ffoo import ini
 ffoo import recon
 
 
@@ -47,17 +45,17 @@ familiars_at() {
     # daemons specific to $1 location plus the rest
     #
     test -n "$1" || usagef "location"
-    iniread -p iam.running.at.$1
-    iniread -p iam.running.at.ANYPLACE
+    eeini -p iam.running.at.$1
+    eeini -p iam.running.at.ANYPLACE
 }
 
 where_i_am() {
     #
     # what is my physical location?
     #
-    if=$(iniread -p iam.using.if)
+    if=$(eeini -p iam.using.if)
     gwmac=$(arp | grep "^gateway\\>.*\\<$if\$" | tr ' ' '\n' | grep :)
-    iniread -p iam.seeing.gw.$gwmac || echo OUT
+    eeini -p iam.seeing.gw.$gwmac || echo OUT
 }
 
 start_familiar() {
@@ -66,7 +64,7 @@ start_familiar() {
     #
     local f=$1
     pids_matching $f && return 0
-    local like=$(iniread -p iam.starting.like.this.$f)
+    local like=$(eeini -p iam.starting.like.this.$f)
     debug -v f like
     if test -n  "$like";
         then
@@ -80,7 +78,7 @@ set_status() {
     # set public status $1 by command in ini file
     #
     local what=$1
-    iniread -p iam.saying.like.this.$what | bash
+    eeini -p iam.saying.like.this.$what | bash
 }
 
 sound_is_muted() {
@@ -138,8 +136,8 @@ i_am_bbl() {
     # changing language
     #
     local cur=$(setxkbmap -v | grep '^symbols: ' | cut -d+ -f2)
-    local all="$(iniread    -p iam.typing.lang)"
-    local def="$(iniread -1 -p iam.typing.lang)"
+    local all="$(eeini    -p iam.typing.lang)"
+    local def="$(eeini -1 -p iam.typing.lang)"
     local nxt=$(
         echo -e "$all\n$all" \
           | grep -m 1 -A 1 $cur \
@@ -155,7 +153,7 @@ i_am_bbldone() {
     #
     # changing language back to normal
     #
-    setxkbmap "$(iniread -1 -p iam.typing.lang)"
+    setxkbmap "$(eeini -1 -p iam.typing.lang)"
 }
 
 i_am_deaf() {

bin/eeln.in

@@ -1,10 +1,8 @@
 #!/bin/bash
 
 . <(ffoom init)
-FFOO_INI_PATH="__EECC_INI_PATH__"
 
 ffoo import core
-ffoo import ini
 
 DEFAULT_TARGET=$HOME
 TRY_RELPATH=true
@@ -43,7 +41,7 @@ link() {
 }
 
 load() {
-    iniread -p ln.dir.$1 | expand_tilde | debug_pipe out
+    eeini -p ln.dir.$1 | expand_tilde | debug_pipe out
 }
 
 while true; do case $1 in

bin/eepush.in

@@ -1,13 +1,11 @@
 #!/bin/bash
 
 . <(ffoom init)
-FFOO_INI_PATH="__EECC_INI_PATH__"
 
 ffoo import core
-ffoo import ini
 ffoo import recon
 
-ORDER="$(iniread -p push.options.order)"
+ORDER="$(eeini -p push.options.order)"
 
 while true; do case $1 in
     -d|--debug)     FFOO_DEBUG=true;    shift;      ;;
@@ -19,11 +17,11 @@ while true; do case $1 in
     *)              hosts="$1"; shift;              ;;
 esac done
 
-test -n "$hosts" || hosts=$(iniread -s push.hosts | debug_pipe ini_hosts)
+test -n "$hosts" || hosts=$(eeini -s push.hosts | debug_pipe ini_hosts)
 debug -v hosts
 
 test -n "$hosts" || die "no valid hosts to begin with"
-paths=$(iniread -s push.paths)
+paths=$(eeini -s push.paths)
 test -n "$paths" || die "no valid paths to begin with"
 
 think "Probing & sorting paths"
@@ -81,7 +79,7 @@ esac
 
 for host in $hosts;
 do
-    iniread -s push.commands \
+    eeini -s push.commands \
       | grep . \
       | while read cmd;
         do

bin/eerevert.in

@@ -1,10 +1,8 @@
 #!/bin/bash
 
 . <(ffoom init)
-FFOO_INI_PATH="__EECC_INI_PATH__"
 
 ffoo import core
-ffoo import ini
 ffoo import recon
 
 usage() {
@@ -54,11 +52,11 @@ snapshot="$2"
 
 test -z "$snapshot" && {
     think "looking for $domain in revert.ini"
-    snapshot=$(iniread -1 -p revert.to.snapshot.$domain)
+    snapshot=$(eeini -1 -p revert.to.snapshot.$domain)
 }
 test -z "$snapshot" && {
     think "looking for default snapshot name in revert.ini"
-    snapshot=$(iniread -1 -p revert.to.snapshot._default_)
+    snapshot=$(eeini -1 -p revert.to.snapshot._default_)
 }
 test -z "$snapshot" && {
     die "could not determine snapshot for $domain"

bin/eewatch.in

@@ -1,7 +1,6 @@
 #!/bin/bash
 
 . <(ffoom init)
-FFOO_INI_PATH="__EECC_INI_PATH__"
 
 ffoo import core
 ffoo import recon