From: Steven Baltakatei Sandoval Date: Mon, 6 Jul 2020 19:02:09 +0000 (+0000) Subject: fix(bkgpslog):Fix error in encryption option handling, bump ver X-Git-Url: https://zdv2.bktei.com/gitweb/EVA-2020-02.git/commitdiff_plain/2038018c4d5ddbc5cc3502ac4a4235f13f017d26?hp=-c fix(bkgpslog):Fix error in encryption option handling, bump ver Note: 0.4.0 version includes new '-b', '-B' options for specifying buffer and script time-to-live values. Note: 0.4.0 version includes new '-R' option for specifying directory containing files specifying recipient pubkeys. --- 2038018c4d5ddbc5cc3502ac4a4235f13f017d26 diff --git a/exec/bkgpslog b/exec/bkgpslog index 6739f01..cc0422c 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.3.10"; # Define version of script. +SCRIPT_VERSION="0.4.0"; # 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) @@ -975,7 +975,7 @@ magicGatherWriteBuffer() { } # write buffer to disk magicParseRecipientDir() { # Desc: Updates recPubKeysValid with pubkeys in dir specified by '-R' option ("recipient directory") - # Inputs: vars: OPTION_RECDIR, argRecDir, OPTION_ENCRYPTION + # Inputs: vars: OPTION_RECDIR, argRecDir, OPTION_ENCRYPT # arry: recPubKeysValid # Outputs: arry: recPubKeysValid # Depends: processArguments, @@ -983,7 +983,7 @@ magicParseRecipientDir() { declare -a candRecPubKeysValid # Check that '-e' and '-R' set - if [[ "$OPTION_ENCRYPTION" = "true" ]] && [[ "$OPTION_RECDIR" = "true" ]]; then + if [[ "$OPTION_ENCRYPT" = "true" ]] && [[ "$OPTION_RECDIR" = "true" ]]; then ### Check that argRecDir is a directory. if [[ -d "$argRecDir" ]]; then recipientDir="$argRecDir"; @@ -1015,10 +1015,10 @@ magicParseRecipientDir() { fi; fi; # Handle case if '-e' set but '-R' not set - if [[ "$OPTION_ENCRYPTION" = "true" ]] && [[ ! "$OPTION_RECDIR" = "true" ]]; then + 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_ENCRYPTION" = "true" ]] && [[ "$OPTION_RECDIR" = "true" ]]; then + if [[ ! "$OPTION_ENCRYPT" = "true" ]] && [[ "$OPTION_RECDIR" = "true" ]]; then yell "ERROR: \\'-R\\' is set but \\'-e\\' is not set."; fi; } # Update recPubKeysValid with argRecDir magicParseRecipientArgs() {