style(user/bknpass):Simplify boilerplate

[BK-2020-03.git] / user / bkots

diff --git a/user/bkots b/user/bkots
index ec371f67aff52105211ca69452b03a8a4d741b23..3c9705ca2cb58a20ee3ebdf2d1f9e05605d178c3 100755 (executable)
--- a/user/bkots
+++ b/user/bkots
@@ -200,7 +200,7 @@ showVersion() {
     vbm "DEBUG:showVersion function called."
 
     cat <<'EOF'
     vbm "DEBUG:showVersion function called."
 
     cat <<'EOF'

-bkots 2.1.0
+bkots 2.1.1

 Copyright (C) 2022 Steven Baltakatei Sandoval
 License GPLv3: GNU GPL version 3
 This is free software; you are free to change and redistribute it.
 Copyright (C) 2022 Steven Baltakatei Sandoval
 License GPLv3: GNU GPL version 3
 This is free software; you are free to change and redistribute it.


@@ -674,7 +674,7 @@ main() {
             path_prf="$(cut -d $'\n' -f1 < <(echo "$item"))";
             if [[ -z "$path_prf" ]]; then
                 yell "ERROR:blank upgrade item encountered. Skipping:item:$item";
             path_prf="$(cut -d $'\n' -f1 < <(echo "$item"))";
             if [[ -z "$path_prf" ]]; then
                 yell "ERROR:blank upgrade item encountered. Skipping:item:$item";

-                continue;
+                return 1; # would have been `continue` were it not in a subshell

             fi;
             vbm "DEBUG:Attempting to upgrade proof file:path_prf:$path_prf";
             if [[ ! $option_dry_run == "true" ]]; then
             fi;
             vbm "DEBUG:Attempting to upgrade proof file:path_prf:$path_prf";
             if [[ ! $option_dry_run == "true" ]]; then


@@ -684,7 +684,7 @@ main() {
 
                     #### assemble command
                     local -a cmd_temp;
 
                     #### assemble command
                     local -a cmd_temp;

-                    cmd_temp+=("ots");
+                    cmd_temp=("ots");

                     if [[ "$opVerbose" = "true" ]]; then cmd_temp+=("-v"); fi;
                     cmd_temp+=("-l" "$url" "--no-default-whitelist");
                     cmd_temp+=("upgrade" "$path_prf");
                     if [[ "$opVerbose" = "true" ]]; then cmd_temp+=("-v"); fi;
                     cmd_temp+=("-l" "$url" "--no-default-whitelist");
                     cmd_temp+=("upgrade" "$path_prf");


@@ -709,7 +709,7 @@ main() {
             path_prf="$(cut -d $'\n' -f2 < <(echo "$item"))";
             if [[ -z "$path_src" ]] || [[ -z "$path_prf" ]]; then
                 yell "ERROR:blank verify item encountered. Skipping:item:$item";
             path_prf="$(cut -d $'\n' -f2 < <(echo "$item"))";
             if [[ -z "$path_src" ]] || [[ -z "$path_prf" ]]; then
                 yell "ERROR:blank verify item encountered. Skipping:item:$item";

-                continue;
+                return 1; # would have been `continue` were it not in a subshell

             fi;
             vbm "DEBUG:Attempting to verify source file:path_src:$path_src";
             vbm "DEBUG:    against proof file:          path_prf:$path_prf";
             fi;
             vbm "DEBUG:Attempting to verify source file:path_src:$path_src";
             vbm "DEBUG:    against proof file:          path_prf:$path_prf";


@@ -720,7 +720,7 @@ main() {
 
                     #### assemble command
                     local -a cmd_temp;
 
                     #### assemble command
                     local -a cmd_temp;

-                    cmd_temp+=("ots");
+                    cmd_temp=("ots");

                     if [[ "$opVerbose" = "true" ]]; then cmd_temp+=("-v"); fi;
                     cmd_temp+=("-l" "$url" "--no-default-whitelist");
                     cmd_temp+=("verify" "-f" "$path_src" "$path_prf");
                     if [[ "$opVerbose" = "true" ]]; then cmd_temp+=("-v"); fi;
                     cmd_temp+=("-l" "$url" "--no-default-whitelist");
                     cmd_temp+=("verify" "-f" "$path_src" "$path_prf");


@@ -744,14 +744,14 @@ main() {
             path_src="$(cut -d $'\n' -f1 < <(echo "$item"))";
             if [[ -z "$path_src" ]]; then
                 yell "ERROR:blank stamp item encountered. Skipping:item:$item";
             path_src="$(cut -d $'\n' -f1 < <(echo "$item"))";
             if [[ -z "$path_src" ]]; then
                 yell "ERROR:blank stamp item encountered. Skipping:item:$item";

-                continue;
+                return 1; # would have been `continue` were it not in a subshell

             fi;
             vbm "DEBUG:Attempting to stamp source file:path_src:$path_src";
             if [[ ! $option_dry_run == "true" ]]; then
 
                 #### assemble command
                 local -a cmd_temp;
             fi;
             vbm "DEBUG:Attempting to stamp source file:path_src:$path_src";
             if [[ ! $option_dry_run == "true" ]]; then
 
                 #### assemble command
                 local -a cmd_temp;

-                cmd_temp+=("ots");
+                cmd_temp=("ots");

                 if [[ "$opVerbose" = "true" ]]; then cmd_temp+=("-v"); fi;
                 cmd_temp+=("stamp" "$path_src");
                 if [[ "$opVerbose" = "true" ]]; then declare -p cmd_temp; fi;
                 if [[ "$opVerbose" = "true" ]]; then cmd_temp+=("-v"); fi;
                 cmd_temp+=("stamp" "$path_src");
                 if [[ "$opVerbose" = "true" ]]; then declare -p cmd_temp; fi;