From cfc25c901c3f27406a7bca2952815eb34e32edc0 Mon Sep 17 00:00:00 2001
From: Steven Baltakatei Sandoval <baltakatei@gmail.com>
Date: Wed, 1 Jul 2020 19:45:22 +0000
Subject: [PATCH 1/1] feat(bkgpslog): Remove termproary working dir at end
- Remove temporary working directory at end of main function.
- Initialize option variables in case they are set earlier.
- Add `--temp-dir` option to permit user to specify temporary working
directory.
---
exec/bkgpslog | 32 ++++++++++++++++++++++++++------
1 file changed, 26 insertions(+), 6 deletions(-)
diff --git a/exec/bkgpslog b/exec/bkgpslog
index db2e6a4..8d0f16f 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'
@@ -204,6 +207,7 @@ processArguments() {
recPubKeys+=("$2"); vbm "pubkey added:""$2"; shift;;
-c | --compress) OPTION_COMPRESS="true"; vbm "DEBUG:Compressed output mode enabled.";;
-z | --time-zone) try setTimeZoneEV "$1";;
+ -t | --temp-dir) OPTION_TMPDIR="true" && TMP_DIR_PRIORITY="$1";;
*) echoerr "ERROR: Unrecognized argument."; exit 1;; # Handle unrecognized options.
esac
shift
@@ -602,18 +606,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 +732,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==
--
2.39.5