From: Steven Baltakatei Sandoval Date: Sat, 30 Apr 2022 08:41:32 +0000 (+0000) Subject: minor(user/bkots):fix verbose comment X-Git-Tag: 0.5.0~7 X-Git-Url: https://zdv2.bktei.com/gitweb/BK-2020-03.git/commitdiff_plain/fdf23d9f42a3b7d37e1b43fbfef7667a4c820611?ds=sidebyside;hp=-c minor(user/bkots):fix verbose comment --- fdf23d9f42a3b7d37e1b43fbfef7667a4c820611 diff --git a/user/bkots b/user/bkots index 7600aea..6627d9d 100644 --- a/user/bkots +++ b/user/bkots @@ -199,7 +199,7 @@ showVersion() { vbm "DEBUG:showVersion function called." cat <<'EOF' -bkots 0.0.4 +bkots 0.0.6 Copyright (C) 2022 Steven Baltakatei Sandoval License GPLv3: GNU GPL version 3 This is free software; you are free to change and redistribute it. @@ -475,6 +475,12 @@ main() { yell "INFO :Skipping file ending in tilde:$item"; continue; # skip to next item fi; + + ## Ignore files that end in '.ots.bak'. + if [[ $item =~ '.ots.bak'$ ]]; then + yell "INFO :Skipping file ending in '.ots.bak':item:$item"; + continue; # skip to next item + fi; ## Add item to file_list_pruned file_list_pruned+=("$item"); @@ -617,14 +623,15 @@ main() { fi; vbm "DEBUG:Attempting to upgrade proof file:path_prf:$path_prf"; if [[ ! $option_dry_run == "true" ]]; then - #ots upgrade "$path_prf"; - for url in "${calendars[@]}"; do - ots -l "$url" --no-default-whitelist upgrade "$path_prf"; - done; + ### Try upgrade with known calendars in random order + while read -r url; do + vbm "DEBUG:Upgrading with calendar:url:$url"; + ots -l "$url" --no-default-whitelist upgrade "$path_prf" && break; + done < <(printf "%s\n" "${calendars[@]}" | shuf); else yell "DEBUG:DRY RUN:Not running:\"ots upgrade $path_prf\""; fi; - sleep "$ots_delay"; + #sleep "$ots_delay"; done; ## Verify files @@ -638,14 +645,15 @@ main() { vbm "DEBUG:Attempting to verify source file:path_src:$path_src"; vbm "DEBUG: against proof file: path_prf:$path_prf"; if [[ ! $option_dry_run == "true" ]]; then - #ots verify -f "$path_src" "$path_prf"; - for url in "${calendars[@]}"; do - ots -l "$url" --no-default-whitelist verify -f "$path_src" "$path_prf"; - done; + ### Try verify with known calendars in random order + while read -r url; do + vbm "DEBUG:Verifying with calendar:url:$url"; + ots -l "$url" --no-default-whitelist verify -f "$path_src" "$path_prf" && break; + done < <(printf "%s\n" "${calendars[@]}" | shuf); else yell "DEBUG:DRY RUN:Not running:\"ots verify -f $path_src $path_prf\""; fi; - sleep "$ots_delay"; + #sleep "$ots_delay"; done; ## Stamp files @@ -657,10 +665,7 @@ main() { fi; vbm "DEBUG:Attempting to stamp source file:path_src:$path_src"; if [[ ! $option_dry_run == "true" ]]; then - #ots stamp "$item"; - for url in "${calendars[@]}"; do - ots -l "$url" --no-default-whitelist stamp "$item"; - done; + ots stamp "$item"; else yell "DEBUG:DRY RUN:Not running:\"ots stamp $item\""; fi;