X-Git-Url: https://zdv2.bktei.com/gitweb/EVA-2020-02.git/blobdiff_plain/fd5ef60ea78598c5bf0689e5af05423f85846590..08134562ff1a040e33229c9ff4c2a1d353bf8b4b:/exec/bkgpslog?ds=sidebyside diff --git a/exec/bkgpslog b/exec/bkgpslog index 3e8d69f..2b19e31 100755 --- a/exec/bkgpslog +++ b/exec/bkgpslog @@ -14,7 +14,7 @@ DIR_TMP_DEFAULT="/dev/shm"; # Default parent of working directory SCRIPT_TIME_START=$(date +%Y%m%dT%H%M%S.%N); PATH="$HOME/.local/bin:$PATH"; # Add "$(systemd-path user-binaries)" path in case apps saved there SCRIPT_HOSTNAME=$(hostname); # Save hostname of system running this script. -SCRIPT_VERSION="0.4.0"; # Define version of script. +SCRIPT_VERSION="0.4.3"; # Define version of script. SCRIPT_NAME="bkgpslog"; # Define basename of script file. SCRIPT_URL="https://gitlab.com/baltakatei/ninfacyzga-01"; # Define wesite hosting this script. AGE_VERSION="1.0.0-beta2"; # Define version of age (encryption program) @@ -990,7 +990,7 @@ magicParseRecipientDir() { #### Initialize variable indicating outcome of pubkey review unset updateRecipients #### Add existing recipients - candRecPubKeysValid=("${recPubKeysValid[@]}"); + candRecPubKeysValid=("${recPubKeysValidStatic[@]}"); #### Parse files in recipientDir for file in "$recipientDir"/*; do ##### Read first line of each file @@ -1014,9 +1014,6 @@ magicParseRecipientDir() { yell "ERROR:$0:Recipient directory $argRecDir does not exist. Exiting."; exit 1; fi; fi; - # Handle case if '-e' set but '-R' not set - if [[ "$OPTION_ENCRYPT" = "true" ]] && [[ ! "$OPTION_RECDIR" = "true" ]]; then - yell "ERROR: \\'-e\\' set but \\'-R\\' is not set."; fi; # Handle case if '-R' set but '-e' not set if [[ ! "$OPTION_ENCRYPT" = "true" ]] && [[ "$OPTION_RECDIR" = "true" ]]; then yell "ERROR: \\'-R\\' is set but \\'-e\\' is not set."; fi; @@ -1026,7 +1023,7 @@ magicParseRecipientArgs() { # Input: vars: OPTION_ENCRYPT from processArguments() # arry: argRecPubKeys from processArguments() # Output: vars: CMD_ENCRYPT, CMD_ENCRYPT_SUFFIX - # arry: recPubKeysValid + # arry: recPubKeysValid, recPubKeysValidStatic # Depends: checkapp(), checkAgePubkey(), validateInput(), processArguments() local recipients @@ -1048,6 +1045,8 @@ magicParseRecipientArgs() { fi; done vbm "DEBUG:Finished processing argRecPubKeys array"; + vbm "STATUS:Array of validated pubkeys:${recPubKeysValid[@]}"; + recPubKeysValidStatic="${recPubKeysValid[@]}"; # Save static image of pubkeys validated by this function ## Form age command string CMD_ENCRYPT="age ""$recipients " && vbm "CMD_ENCRYPT:$CMD_ENCRYPT"; @@ -1162,7 +1161,7 @@ main() { magicInitWorkingDir; # Sets DIR_TMP from argTempDirPriority ### Set output encryption and compression option strings #### React to "-r" ("encryption recipients") option - magicParseRecipientArgs; # Updates recPubKeysValid, CMD_ENCRYPT[_SUFFIX] + magicParseRecipientArgs; # Updates recPubKeysValid, CMD_ENCRYPT[_SUFFIX] from argRecPubKeys #### React to "-c" ("compression") option magicParseCompressionArg; # Updates CMD_COMPRESS[_SUFFIX] #### React to "-R" ("recipient directory") option @@ -1201,6 +1200,7 @@ main() { # MAIN LOOP:Record gps data until script lifespan ends while [[ "$SECONDS" -lt "$SCRIPT_TTL" ]]; do + magicParseRecipientDir magicGatherWriteBuffer & sleep "$BUFFER_TTL"; done