ollama-benchmark, fixes after doing a few more tests.

pv-test, fix pv and pv2 outfile location if path in filename, test defaults for each option by keeping the skip, fix some spacing issues.

bin-shared/pull_clone.sh

@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+
+# TBD:
+# - merge into send-master script and use a variable to control push vs pull.
+
+## Variables ##
+
+PROG="$(basename -- "${BASH_SOURCE[0]}")"
+loop=false
+
+DIR="`pwd`"
+dir="`basename $DIR`"
+
+## Validations ##
+
+if [[ "$DIR" != *"-clone" && "$DIR" != *"-SYNC" ]]; then
+   echo "'$DIR' is not labeled as a CLONE or SYNC. Skipping download."
+   exit 0
+fi
+
+# Only pull the existing subdirectories rather than ALL content.
+subdirs_only="false"
+if [[ "$dir" == "music-clone" ]]; then
+   subdirs_only="true"
+fi
+
+## Main ##
+
+echo "`date` - Pulling" \
+   "'$PROD_DATA_USER@$PROD_DATA_HOST:$PROD_DATA_PORT$PROD_DATA_DIR/$dir'" \
+   "to '$dir'."
+
+sleep=0
+while true; do
+   if (( $sleep > 0 )); then
+      echo "Sleeping for '$sleep' seconds..."
+      sleep $sleep
+   fi
+
+   if [[ "$subdirs_only" == "true" ]]; then
+      ls $DIR | while read subdir; do
+         echo -e "\n`date` - Working subdirectory '$subdir'..."
+         clone -e "ssh -p $PROD_DATA_PORT" \
+               $PROD_DATA_USER@$PROD_DATA_HOST:$PROD_DATA_DIR/$dir/$subdir/ \
+               ./$subdir &&
+            echo "`date` - Success!" ||
+            echo "`date` - Failed!"
+      done
+   else
+      clone -e "ssh -p $PROD_DATA_PORT" \
+            $PROD_DATA_USER@$PROD_DATA_HOST:$PROD_DATA_DIR/$dir/ \
+            . &&
+         echo "`date` - Success!" ||
+         echo "`date` - Failed!"
+   fi
+
+   sleep=30
+   if [[ "$loop" == false ]]; then
+      break;
+   fi
+done
+
+## Complete ##
+
+echo -e "\n`date` - $PROG complete."
+exit 0

bin-shared/send_master.sh

@@ -1,33 +1,48 @@
 #!/usr/bin/env bash
 
 # TBD:
-# - ensure all SERVER_* variables actually exist in environment
-# - test the script :)
-# - add parameter to set loop=true
+# - add parameter to set loop=true, and accept a value for sleep seconds
 # - allow passing the script a variable for the dir, rather than assuming curr
 
 ## Variables ##
 
-DIR="$(dirname -- "${BASH_SOURCE[0]}")"
+PROG="$(basename -- "${BASH_SOURCE[0]}")"
 loop=false
 
+DIR="`pwd`"
+dir="`basename $DIR`"
+
 ## Validations ##
 
-if [[ "$DIR" != *"MASTER" ]]; then
-   echo "This directory is not labeled as a MASTER. Skipping upload."
+if [[ "$DIR" != *"-MASTER" && "$DIR" != *"-SYNC" ]]; then
+   echo "'$DIR' is not labeled as a MASTER or SYNC. Skipping upload."
    exit 0
 fi
 
 ## Main ##
 
-new_dir="`basename $DIR`"
-new_dir="${new_dir//MASTER/clone}"
+new_dir="${dir//MASTER/clone}"
 
-do
-   clone -e "ssh -p $SERVER_PORT" ./ $SERVER_USER@$SERVER_NAME:$SERVER_SFTP/$new_dir
-while $loop
+echo "`date` - Sending '$dir' to" \
+   "'$PROD_DATA_USER@$PROD_DATA_HOST:$PROD_DATA_PORT$PROD_DATA_DIR/$new_dir'"
+
+sleep=0
+while true; do
+   if (( $sleep > 0 )); then
+      echo "Sleeping for '$sleep' seconds..."
+      sleep $sleep
+   fi
+   clone -e "ssh -p $PROD_DATA_PORT" ./ \
+         $PROD_DATA_USER@$PROD_DATA_HOST:$PROD_DATA_DIR/$new_dir &&
+      echo "`date` - Success!" ||
+      echo "`date` - Failed!"
+   sleep=30
+   if [[ "$loop" == false ]]; then
+      break;
+   fi
+done
 
 ## Complete ##
 
-echo "Done!"
+echo "`date` - $PROG complete."
 exit 0

vimrc.vim

@@ -0,0 +1,11 @@
+" Turn off syntax, flashy lights, etc. Make VIM into a basic editor.
+syntax off
+set nohlsearch
+set noautoindent noautowrite noshowmatch wrapmargin=0 report=1 ts=3
+set ignorecase
+
+" Turn off auto-commenting.
+autocmd Filetype * set fo-=c fo-=r fo-=o
+
+" qq shortcut for immediately exiting all files without saving.
+nnoremap qq :qa!<cr>