Normalize tests for paths.

The `-f` flag to test(1) checks for regular files, which is generally
not the right thing to do when looking for ZFS keys because keylocation
can point to, e.g., a device node.

Every `-f` test in where we expressly intend to read (or source) a file
has been moved to `-r`, and tests for ZFS keys (which are intended to be
passed as locations to `zfs load-key` rather than read directly) are
relaxed to the maximally generic existence test (`-e`).

Also, swap `test` for `[ ]` syntax everywhere and drop sourcing of
`zfsbootmenu-lib.sh` in the PWD. That was probably an artifact of early
testing, but we have better test setups now. Instead, look only for the
canonical `/lib/zfsbootmenu-lib.sh`.

Closes #127.

Author: ahesford

90zfsbootmenu/zfs-chroot.sh

@@ -2,9 +2,7 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab
 
 # shellcheck disable=SC1091
-test -f /lib/zfsbootmenu-lib.sh && source /lib/zfsbootmenu-lib.sh
-# shellcheck disable=SC1091
-test -f zfsbootmenu-lib.sh && source zfsbootmenu-lib.sh
+[ -r /lib/zfsbootmenu-lib.sh ] && source /lib/zfsbootmenu-lib.sh
 
 selected="${1}"
 
@@ -29,7 +27,7 @@ if mountpoint="$( allow_rw=yes mount_zfs "${selected}" )"; then
   fi
   echo -e ", /tmp is shared and read/write\n"
 
-  if [ -f "${mountpoint}/bin/bash" ]; then
+  if [ -x "${mountpoint}/bin/bash" ]; then
     _SHELL="/bin/bash"
   else
     _SHELL="/bin/sh"

90zfsbootmenu/zfsbootmenu-countdown.sh

@@ -5,9 +5,7 @@
 trap '' SIGINT
 
 # shellcheck disable=SC1091
-test -f /lib/zfsbootmenu-lib.sh && source /lib/zfsbootmenu-lib.sh
-# shellcheck disable=SC1091
-test -f zfsbootmenu-lib.sh && source zfsbootmenu-lib.sh
+[ -r /lib/zfsbootmenu-lib.sh ] && source /lib/zfsbootmenu-lib.sh
 
 if [ -z "${BASE}" ]; then
   export BASE="/zfsbootmenu"

90zfsbootmenu/zfsbootmenu-exec.sh

@@ -37,7 +37,7 @@ udevadm settle
 # try to set console options for display and interaction
 # this is sometimes run as an initqueue hook, but cannot be guaranteed
 #shellcheck disable=SC2154
-test -x /lib/udev/console_init -a -c "${control_term}" \
+[ -x /lib/udev/console_init ] && [ -c "${control_term}" ] \
   && /lib/udev/console_init "${control_term##*/}" >/dev/null 2>&1
 
 #shellcheck disable=SC2154

90zfsbootmenu/zfsbootmenu-lib.sh

@@ -60,7 +60,7 @@ mount_zfs() {
   fi
 
   mnt="${BASE}/${fs}/mnt"
-  test -d "${mnt}" || mkdir -p "${mnt}"
+  mkdir -p "${mnt}"
 
   # @ always denotes a snapshot
   if [[ "${fs}" =~ @ ]]; then
@@ -190,7 +190,7 @@ draw_be() {
 
   zdebug "using environment file: ${env}"
 
-  [ -f "${env}" ] || return 130
+  [ -r "${env}" ] || return 130
 
   header="$( header_wrap "[ENTER] boot" "[ESC] refresh view" "[CTRL+H] help" "" \
     "[CTRL+E] edit kcl" "[CTRL+K] kernels" "[CTRL+D] set bootfs" "[CTRL+S] snapshots" "" \
@@ -225,7 +225,7 @@ draw_kernel() {
 
   zdebug "using kernels file: ${_kernels}"
 
-  test -f "${_kernels}" || return 130
+  [ -r "${_kernels}" ] || return 130
 
   header="$( header_wrap \
     "[ENTER] boot" "[ESC] back" "" "[CTRL+D] set default" "[CTRL+H] help" )"
@@ -320,7 +320,7 @@ draw_diff() {
       --preview-window="up:${PREVIEW_HEIGHT}" \
       --bind 'esc:execute-silent( kill $( cat /tmp/diff.pid ) )+abort'
 
-  test -f /tmp/diff.pid  && rm /tmp/diff.pid
+  rm -f /tmp/diff.pid
   umount "${mnt}"
 
   return
@@ -724,7 +724,7 @@ find_root_prefix() {
       # OS type is in ID and ID_LIKE variables; /etc supersedes /usr/lib
       unset ID ID_LIKE
       for osrel in ${zfsbe_mnt}/{usr/lib,etc}/os-release; do
-        if [ -f "${osrel}" ]; then
+        if [ -r "${osrel}" ]; then
           # shellcheck disable=SC1090
           . "${osrel}" >/dev/null 2>&1
         fi
@@ -813,7 +813,7 @@ load_be_cmdline() {
 
   # Use BE-specific cmdline if found, fall back to generic default
   zfsbe_args="quiet loglevel=4"
-  if [ -f "${BASE}/${zfsbe_fs}/cmdline" ]; then
+  if [ -r "${BASE}/${zfsbe_fs}/cmdline" ]; then
     zdebug "using ${BASE}/${zfsbe_fs}/cmdline as commandline for ${zfsbe_fs}"
     zfsbe_args="$(head -1 "${BASE}/${zfsbe_fs}/cmdline" | tr -d '\n')"
   fi
@@ -1304,7 +1304,7 @@ cache_key() {
   fi
 
   ret=1
-  if [ -f "${mnt}/${keyfile}" ]; then
+  if [ -e "${mnt}/${keyfile}" ]; then
     keydir="${keyfile%/*}"
     if [ "x${keydir}" != "x${keyfile}" ] && [ -n "${keydir}" ]; then
       mkdir -p "${keycache}/${keydir}"
@@ -1364,7 +1364,7 @@ load_key() {
   key="${keylocation#file://}"
   key="${key#/}"
 
-  if [ -f "/${key}" ]; then
+  if [ -e "/${key}" ]; then
     # Prefer the actual path to the key file
     keypath="/${key}"
   elif keysource="$( be_keysource "${fs}" )" && [ "${NO_CACHE}" -eq 0 ]; then
@@ -1378,14 +1378,14 @@ load_key() {
     fi
 
     # If the cached key exists, prefer it
-    if [ -f "${BASE}/.keys/${keysource}/${key}" ]; then
+    if [ -e "${BASE}/.keys/${keysource}/${key}" ]; then
       keypath="${BASE}/.keys/${keysource}/${key}"
       zdebug "cached key path for $fs is ${keypath}"
     fi
   fi
 
   # Load a key from a file, if possible and necessary
-  if [ -f "${keypath}" ] && be_is_locked "${fs}" >/dev/null 2>&1; then
+  if [ -e "${keypath}" ] && be_is_locked "${fs}" >/dev/null 2>&1; then
     if zfs load-key -L "file://${keypath}" "${encroot}"; then
       zdebug "unlocked ${encroot} from key at ${keypath}"
       return 0

90zfsbootmenu/zfsbootmenu-parse-commandline.sh

@@ -96,8 +96,6 @@ if [ ${wait_for_zfs} -eq 1 ]; then
   ln -s /dev/null /dev/root 2>/dev/null
   # shellcheck disable=SC2154
   initqueuedir="${hookdir}/initqueue/finished"
-  test -d "${initqueuedir}" || {
-    initqueuedir="${hookdir}/initqueue-finished"
-  }
+  [ -d "${initqueuedir}" ] || initqueuedir="${hookdir}/initqueue-finished"
   echo '[ -e /dev/zfs ]' > "${initqueuedir}/zfs.sh"
 fi

90zfsbootmenu/zfsbootmenu-preview.sh

@@ -12,7 +12,7 @@ RED='\033[0;31m'
 NC='\033[0m' # No Color
 
 # shellcheck disable=SC1091
-test -f /lib/zfsbootmenu-lib.sh && source /lib/zfsbootmenu-lib.sh
+[ -r /lib/zfsbootmenu-lib.sh ] && source /lib/zfsbootmenu-lib.sh
 
 while IFS= read -r line
 do

90zfsbootmenu/zfsbootmenu.sh

@@ -6,9 +6,7 @@
 ##
 
 # shellcheck disable=SC1091
-test -f /lib/zfsbootmenu-lib.sh && source /lib/zfsbootmenu-lib.sh
-# shellcheck disable=SC1091
-test -f zfsbootmenu-lib.sh && source zfsbootmenu-lib.sh
+[ -r /lib/zfsbootmenu-lib.sh ] && source /lib/zfsbootmenu-lib.sh
 
 if [ -z "${BASE}" ]; then
   export BASE="/zfsbootmenu"