X-Git-Url: https://zdv2.bktei.com/gitweb/BK-2020-03.git/blobdiff_plain/3a8398d26ae4b63193df831da2e4d33c26d19a53..b108df29ae34ba935b19ea927d75bf3f5230045c:/user/bkots?ds=sidebyside

diff --git a/user/bkots b/user/bkots
index dba0ef5..f829ce6 100644
--- a/user/bkots
+++ b/user/bkots
@@ -199,7 +199,7 @@ showVersion() {
     vbm "DEBUG:showVersion function called."
 
     cat <<'EOF'
-bkots 0.0.3
+bkots 0.0.8
 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,12 +665,9 @@ 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 verify stamp "$item";
-            done;
+            ots stamp "$path_src";
         else
-            yell "DEBUG:DRY RUN:Not running:\"ots stamp $item\"";
+            yell "DEBUG:DRY RUN:Not running:\"ots stamp $path_src\"";
         fi;
         sleep "$ots_delay";
     done;