feat(user/check_ots.sh):Handle .ots.bak, .OTS files.

[BK-2020-03.git] / unitproc / bkshuf

diff --git a/unitproc/bkshuf b/unitproc/bkshuf
index 4bf9f997ebe53fe16d68b538cf98214e457add5e..d2d0763ebbeea7f9aa40061fe673f1ba372252b2 100644 (file)
--- a/unitproc/bkshuf
+++ b/unitproc/bkshuf
@@ -1,12 +1,15 @@
 #!/usr/bin/env bash
 # Desc: Mixes input lines while also preserving some neighbors
 # Usage: cat file | bkshuf arg1
 #!/usr/bin/env bash
 # Desc: Mixes input lines while also preserving some neighbors
 # Usage: cat file | bkshuf arg1

-# Version 0.0.1
+# Version 0.1.2

 # Depends: bc 1.07.1, GNU Coreutils 8.32 (shuf)
 # Input: var: arg1  initial lines to output
 
 # Depends: bc 1.07.1, GNU Coreutils 8.32 (shuf)
 # Input: var: arg1  initial lines to output
 

-BKSHUF_PARAM_LINEC=1000000;
-BKSHUF_PARAM_GSIZE=25 # lines per group for BKSHUF_PARAM_LINEC lines of input
+# Load env vars
+## For these numbers of lines of input...
+if [[ ! -v BKSHUF_PARAM_LINEC ]]; then BKSHUF_PARAM_LINEC=1000000; fi;
+##   ... target this group size.
+if [[ ! -v BKSHUF_PARAM_GSIZE ]]; then BKSHUF_PARAM_GSIZE=25; fi; 

 
 
 yell() { echo "$0: $*" >&2; } # print script path and all args to stderr
 
 
 yell() { echo "$0: $*" >&2; } # print script path and all args to stderr


@@ -121,7 +124,12 @@ main() {
     else
         lc_out_max="$1"; # output line count
     fi;
     else
         lc_out_max="$1"; # output line count
     fi;

-    
+
+    # Check env vars
+    if ! checkInt "$BKSHUF_PARAM_LINEC"; then
+        die "FATAL:Not an int:BKSHUF_PARAM_LINEC:$BKSHUF_PARAM_LINEC"; fi;
+    if ! checkInt "$BKSHUF_PARAM_GSIZE"; then
+        die "FATAL:Not an int:BKSHUF_PARAM_LINEC:$BKSHUF_PARAM_GSIZE"; fi;

     
     # store input lines from stdin (like `shuf`)
     while read -r line; do
     
     # store input lines from stdin (like `shuf`)
     while read -r line; do


@@ -153,6 +161,7 @@ main() {
     lc_out="0"; # init output line counter
     if [[ -z "$lc_out_max" ]]; then lc_out_max="$lco"; fi;    
     ip="$(shuf -i0-$(( lco - 1 )) -n1)"; # init input index pointer
     lc_out="0"; # init output line counter
     if [[ -z "$lc_out_max" ]]; then lc_out_max="$lco"; fi;    
     ip="$(shuf -i0-$(( lco - 1 )) -n1)"; # init input index pointer

+    RANDOM="$(shuf -i0-32767 -n1)"; # init Bash PRNG

     n_loop1="0";
     #yell "DEBUG:max_blanks:$max_blanks"
     while [[ $lcr -ge 1 ]] && [[ $lc_out -lt $lc_out_max ]]; do
     n_loop1="0";
     #yell "DEBUG:max_blanks:$max_blanks"
     while [[ $lcr -ge 1 ]] && [[ $lc_out -lt $lc_out_max ]]; do