X-Git-Url: https://zdv2.bktei.com/gitweb/EVA-2020-02.git/blobdiff_plain/aa2a49f124fb37856d7dc19b66cee3392440c8b5..6a17e8e74bcfbd88dab3504ba01e726266b3e001:/exec/bkgpslog diff --git a/exec/bkgpslog b/exec/bkgpslog index db2e6a4..d0dde14 100755 --- a/exec/bkgpslog +++ b/exec/bkgpslog @@ -22,6 +22,9 @@ declare -Ag dirRollCall # Associative array for storing dir status declare -a recPubKeys # for processArguments function declare recipients # for main function +## Initialize variables +OPTION_VERBOSE=""; OPTION_ENCRYPT=""; OPTION_COMPRESS=""; OPTION_TMPDIR=""; + #===BEGIN Declare local script functions=== checkapp() { # Desc: If arg is a command, save result in assoc array 'appRollCall' @@ -151,7 +154,8 @@ showUsage() { echoerr " Encrypt output." echoerr echoerr " -r, --recipient [ pubkey string ]" - echoerr " Specify recipient." + echoerr " Specify recipient. May be age or ssh pubkey." + echoerr " See https://github.com/FiloSottile/age" echoerr echoerr " -o, --output [ directory ]" echoerr " Specify output directory to save logs." @@ -159,6 +163,13 @@ showUsage() { echoerr " -c, --compress" echoerr " Compress output with gzip (before encryption if enabled)." echoerr + echoerr " -z, --time-zone" + echoerr " Specify time zone. (ex: \"America/New_York\")" + echoerr + echoerr " -t, --temp-dir" + echoerr " Specify parent directory for temporary working directory." + echoerr " Default: \"/dev/shm\"" + echoerr echoerr "EXAMPLE: (bash script lines)" echoerr "/bin/bash bkgpslog -e -c \\" echoerr "-r age1mrmfnwhtlprn4jquex0ukmwcm7y2nxlphuzgsgv8ew2k9mewy3rs8u7su5 \\" @@ -203,8 +214,9 @@ processArguments() { -r | --recipient) # Add 'age' recipient via public key string recPubKeys+=("$2"); vbm "pubkey added:""$2"; shift;; -c | --compress) OPTION_COMPRESS="true"; vbm "DEBUG:Compressed output mode enabled.";; - -z | --time-zone) try setTimeZoneEV "$1";; - *) echoerr "ERROR: Unrecognized argument."; exit 1;; # Handle unrecognized options. + -z | --time-zone) try setTimeZoneEV "$2"; shift;; + -t | --temp-dir) OPTION_TMPDIR="true" && TMP_DIR_PRIORITY="$2"; shift;; + *) echoerr "ERROR: Unrecognized argument: $1"; echoerr "STATUS:All arguments:$*"; exit 1;; # Handle unrecognized options. esac shift done @@ -602,18 +614,31 @@ setScriptTTL() { } # Seconds until next (day|hour). main() { processArguments "$@" # Process arguments. - + # Determine working directory + ## Set DIR_TMP_PARENT to user-specified value if specified + if [[ "$OPTION_TMPDIR" = "true" ]]; then + if [[ -d "$TMP_DIR_PRIORITY" ]]; then + DIR_TMP_PARENT="$OPTION_TMPDIR"; + else + yell "WARNING:Specified temporary working directory not valid:$OPTION_TMP_DIR"; + exit 1; + fi + fi + + ## Set DIR_TMP_PARENT to default or fallback otherwise if [[ -d "$DIR_TMP_DEFAULT" ]]; then - DIR_TMP_BASE="$DIR_TMP_DEFAULT"; # Use default working directory parent (ex: '/dev/shm') - #### elif [[ -d /tmp ]]; then - #### yell "WARNING:/dev/shm not available. Falling back to /tmp ."; - #### DIR_TMP_BASE="/tmp"; + DIR_TMP_PARENT="$DIR_TMP_DEFAULT"; + elif [[ -d /tmp ]]; then + yell "WARNING:/dev/shm not available. Falling back to /tmp ."; + DIR_TMP_PARENT="/tmp"; else yell "ERROR:No valid working directory available. Exiting."; exit 1; fi - DIR_TMP="$DIR_TMP_BASE"/"$SCRIPT_TIME_START""..bkgpslog"; # Define working directory for temproary files + + ## Set DIR_TMP using DIR_TMP_PARENT and nonce (SCRIPT_TIME_START) + DIR_TMP="$DIR_TMP_PARENT"/"$SCRIPT_TIME_START""..bkgpslog"; # Note: removed at end of main(). # Set output encryption and compression option strings if [[ "$OPTION_ENCRYPT" = "true" ]]; then # Check if encryption option active. @@ -715,6 +740,9 @@ main() { unset bufferBash FILEOUT_BASENAME PATHOUT_NMEA PATHOUT_GPX PATHOUT_KML PATHOUT_TAR; ((debugCounter++)) done + + # Remove DIR_TMP + try rm -r "$DIR_TMP"; } # Main function. #===END Declare local script functions=== #==END Define script parameters==