Merge pull request #1 from claui/unbound-variable

Fix `unbound variable`, add switches

Author: claui

.editorconfig

@@ -0,0 +1,32 @@
+# https://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[.gitattributes]
+indent_size = 16
+
+[*.{diff,patch}]
+end_of_line = lf
+trim_trailing_whitespace = false
+
+[Makefile*]
+indent_size = 4
+indent_style = tab
+
+[*.bash]
+end_of_line = lf
+indent_size = 2
+
+[*.{js,json}]
+indent_size = 2
+
+[*.md]
+indent_size = 2
+trim_trailing_whitespace = false

.gitattributes

@@ -0,0 +1,26 @@
+# CAUTION:
+# Always run the following command after adding/editing an
+# `eol` entry:
+#
+#   git add --renormalize FILES_WITH_AFFECTED_EXTENSION
+#
+# This keeps existing files consistent with the new setting.
+#
+# Example:
+#
+#   git add --renormalize '*.foo' '*.bar'
+
+.editorconfig   text eol=lf
+.gitattributes  text eol=lf
+
+# LF required for interactive patching as of Git 2.17.1
+*.diff          text eol=lf
+*.patch         text eol=lf
+
+Makefile*       text eol=lf
+
+# LF required to allow shell scripts to run
+*.bash          text eol=lf
+
+*.json          text eol=lf
+*.md            text eol=lf

.vscode/extensions.json

@@ -0,0 +1,6 @@
+{
+  "recommendations": [
+    "editorconfig.editorconfig",
+    "timonwong.shellcheck"
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,9 @@
+{
+  "files.exclude": {
+    "**/.git": true
+  },
+  "shellcheck.customArgs": [
+    "--external-sources"
+  ],
+  "shellcheck.useWorkspaceRootAsCwd": true
+}

bin/znaphodl

@@ -1,9 +1,10 @@
 #!/bin/bash
-pushd "$(dirname -- "${BASH_SOURCE[0]}")/.." > /dev/null
+pushd "$(dirname -- "${BASH_SOURCE[0]}")/.." > /dev/null || exit 1
 BASENAME="$(basename -- "${BASH_SOURCE[0]}")"
 
+# shellcheck disable=SC1090
 . "libexec/${BASENAME}.bash"
 
-popd > /dev/null
+popd > /dev/null || exit 1
 shopt -s extglob
 __"${BASENAME//+([^a-z0-9_])/_}" "$@"

libexec/dataset_id.bash

@@ -16,6 +16,7 @@ export -f __dataset_id__cleanup
 
 function __dataset_id__load_dataset_record {
   local pid exitstatus fifodir fifoname
+  export dataset dataset_id
 
   trap __dataset_id__cleanup EXIT INT HUP TERM
   fifodir="$(mktemp -d)"
@@ -24,7 +25,7 @@ function __dataset_id__load_dataset_record {
 
   (__dataset_id__dataset_record "$@") > "${fifoname}" &
   pid="$!"
-  IFS=$'\t' read -d $'\n' dataset dataset_id < "${fifoname}" \
+  IFS=$'\t' read -r -d $'\n' dataset dataset_id < "${fifoname}" \
     || true
 
   wait "${pid}" || exitstatus="$?"
@@ -62,7 +63,7 @@ function __dataset_id__dataset_record {
     esac
   done
 
-  shift "$(($OPTIND-1))"
+  shift "$((OPTIND-1))"
 
   parent_dataset="$1"
 

libexec/znaphodl.bash

@@ -78,7 +78,7 @@ function __znaphodl__load_target_dataset_record {
 
   (__znaphodl__target_dataset_record) > "${fifoname}" &
   pid="$!"
-  IFS=$'\t' read -d $'\n' target_dataset target_hostname \
+  IFS=$'\t' read -r -d $'\n' target_dataset target_hostname \
     < "${fifoname}" \
     || true
 
@@ -143,10 +143,8 @@ function __znaphodl {
   local OPTIND=1
   local option
 
-  local debug=0
   local latest_common_snapshot
   local last_query_timestamp_property_name
-  local lockfile
   local log_available_space=0
   local source_dataset
   local source_hold_tag
@@ -160,6 +158,8 @@ function __znaphodl {
 
   set -eu
 
+  debug=0
+
   while getopts ':dln' option; do
     case "${option}" in
     d)
@@ -180,7 +180,7 @@ function __znaphodl {
     esac
   done
 
-  shift "$(($OPTIND-1))"
+  shift "$((OPTIND-1))"
 
   source_dataset="${1?}"
   target_dataset_key="${2?}"

libexec/znaphodlz.bash

@@ -6,13 +6,12 @@ function __znaphodlz {
   local home_poolname
   local poolnames
 
-  __zpoolz__load_poolnames
-  if [[ "$?" -ne 0 ]]; then
+  if ! __zpoolz__load_poolnames; then
     echo >&2 "Unable to identify pool names"
     return 1
   fi
 
-  if [[ ! "${poolnames[@]}" ]]; then
+  if [[ ! "${poolnames}" ]]; then
     echo >&2 "No pools found"
     return 1
   fi
@@ -27,7 +26,7 @@ function __znaphodlz {
 
   for home_poolname in "${poolnames[@]}"; do
     if {
-      __dataset_id__load_dataset_record -r "${home_poolname}";
+      __dataset_id__load_dataset_record -r "$@" "${home_poolname}";
     }; then
       echo $'\n'"Home dataset ${dataset}"
       zfs list -H -t snapshot -o name "${dataset}" \

libexec/znaplizt.bash

@@ -65,19 +65,18 @@ function __znaplizt {
     esac
   done
 
-  shift "$(($OPTIND-1))"
+  shift "$((OPTIND-1))"
 
-  if [[ "$@" ]]; then
+  if [[ "$#" -gt 0 ]]; then
     poolnames=("$@")
   else
-    __zpoolz__load_poolnames
-    if [[ "$?" -ne 0 ]]; then
+    if ! __zpoolz__load_poolnames; then
       echo >&2 "Unable to identify pool names"
       return 1
     fi
   fi
 
-  if [[ ! "${poolnames[@]}" ]]; then
+  if [[ "${#poolnames[@]}" -eq 0 ]]; then
     echo >&2 "No pools found"
     return 1
   fi

libexec/zpoolz.bash

@@ -15,7 +15,7 @@ function __zpoolz__load_poolnames {
 
   (zpool list -H -o name) > "${fifoname}" &
   zpool_pid="$!"
-  IFS=$'\n' read -a poolnames -d '' < "${fifoname}" || true
+  IFS=$'\n' read -r -a poolnames -d '' < "${fifoname}" || true
 
   wait "${zpool_pid}" || zpool_status="$?"