X-Git-Url: https://zdv2.bktei.com/gitweb/EVA-2020-02.git/blobdiff_plain/18490e2bd8710f52045979c2fdf7aa6af3c63f12..9efeccb59ffdf317ee26669fb44bfbbf7e879ff6:/exec/bkgpslog

diff --git a/exec/bkgpslog b/exec/bkgpslog
index 6df7797..0305303 100755
--- a/exec/bkgpslog
+++ b/exec/bkgpslog
@@ -212,7 +212,7 @@ processArguments() {
 	    -o | --output) if [ -d "$2" ]; then DIR_OUT="$2"; vbm "DEBUG:DIR_OUT:$DIR_OUT"; shift; fi ;; # Define output directory.
 	    -e | --encrypt) OPTION_ENCRYPT="true"; vbm "DEBUG:Encrypted output mode enabled.";;
 	    -r | --recipient) # Add 'age' recipient via public key string
-		recPubKeys+=("$2"); vbm "pubkey added:""$2"; shift;;
+		recPubKeys+=("$2"); vbm "STATUS:pubkey added:""$2"; shift;;
 	    -c | --compress) OPTION_COMPRESS="true"; vbm "DEBUG:Compressed output mode enabled.";;
 	    -z | --time-zone) try setTimeZoneEV "$2"; shift;;
 	    -t | --temp-dir) OPTION_TMPDIR="true" && TMP_DIR_PRIORITY="$2"; shift;;
@@ -648,7 +648,7 @@ main() {
 		if echo "butts" | age -a -r "$pubkey" 1>/dev/null; then
 		    # Form age recipient string
 		    recipients="$recipients""-r $pubkey ";
-		    vbm "Added pubkey for forming age recipient string:""$pubkey";
+		    vbm "STATUS:Added pubkey for forming age recipient string:""$pubkey";
 		    vbm "DEBUG:recipients:""$recipients";
 		else
 		    yell "ERROR:Exit code ""$?"". Invalid recipient pubkey string. Exiting."; exit 1;
@@ -695,33 +695,39 @@ main() {
 
     # Initialize 'tar' archive
     ## Define output tar path (note: each day gets *one* tar file (Ex: "20200731..hostname_location.[.gpx.gz].tar"))
-    PATHOUT_TAR="$DIR_OUT"/"$(dateShort)".."$SCRIPT_HOSTNAME""_location""$CMD_COMPRESS_SUFFIX""$CMD_ENCRYPT_SUFFIX".tar && vbm "Set PATHOUT_TAR to:$PATHOUT_TAR";
+    PATHOUT_TAR="$DIR_OUT"/"$(dateShort)".."$SCRIPT_HOSTNAME""_location""$CMD_COMPRESS_SUFFIX""$CMD_ENCRYPT_SUFFIX".tar && \
+	vbm "STATUS:Set PATHOUT_TAR to:$PATHOUT_TAR";
     ## Write bkgpslog version to DIR_TMP/VERSION
     echo "$0"" Version:""$SCRIPT_VERSION" >> "$DIR_TMP/VERSION" && vbm "DEBUG:VERSION created.";
     ## Check if PATHOUT_TAR already exists.
     if [[ -f "$PATHOUT_TAR" ]]; then
 	vbm "STATUS:Output tar already exists:$PATHOUT_TAR";
 	### Check if preexisting tar is appendable.
-	PATHOUT_APPENDTEST="$DIR_TMP"/"$(dateTimeShort)..append_test.txt" && vbm "DEBUG:Set PATHOUT_APPENDTEST to:$PATHOUT_APPENDTEST";
-	echo "$(dateTimeShort)" >> "$PATHOUT_APPENDTEST" && vbm "DEBUG:""$PATHOUT_APPENDTEST"" created."
+	PATHOUT_APPENDTEST="$DIR_TMP"/"$(dateTimeShort)..RESUMING_LOGGING_SESSION.txt" && \
+	    vbm "DEBUG:Set PATHOUT_APPENDTEST to:$PATHOUT_APPENDTEST";
+	echo "$(dateTimeShort):""$(basename "$0")"" version $SCRIPT_VERSION resuming logging session." >> "$PATHOUT_APPENDTEST" && \
+	    vbm "DEBUG:""$PATHOUT_APPENDTEST"" created."
 	if ! tar --append --directory="$DIR_TMP" --file="$PATHOUT_TAR" "$(basename "$PATHOUT_APPENDTEST")"; then
 	    ### If not appendable, label tar broken, move tar, proceed.
-	    mv "$PATHOUT_TAR" "${PATHOUT_TAR%.*}""-broken$(dateTimeShort)".tar && vbm "DEBUG:tar not writable, moving out of the way $PATHOUT_TAR";
+	    mv "$PATHOUT_TAR" "${PATHOUT_TAR%.*}""-broken$(dateTimeShort)".tar && \
+		vbm "DEBUG:tar not writable, moving out of the way $PATHOUT_TAR";
 	fi
     else
 	vbm "STATUS:Output tar does not already exist. Creating:$PATHOUT_TAR"
 	### If (no preexisting|appendable) tar found, create empty tar archive at PATHOUT_TAR
-	try tar --create --directory="$DIR_TMP" --file="$PATHOUT_TAR" --files-from=/dev/null && vbm "DEBUG:Empty tar created at:$PATHOUT_TAR";
+	try tar --create --directory="$DIR_TMP" --file="$PATHOUT_TAR" --files-from=/dev/null && \
+	    vbm "DEBUG:Empty tar created at:$PATHOUT_TAR";
     fi	
     ## Append VERSION file to PATHOUT_TAR
-    try tar --append --directory="$DIR_TMP" --file="$PATHOUT_TAR" "VERSION" && vbm "DEBUG:VERSION added to $PATHOUT_TAR";
+    try tar --append --directory="$DIR_TMP" --file="$PATHOUT_TAR" "VERSION" && \
+	vbm "DEBUG:VERSION added to $PATHOUT_TAR";
     
     # Record gps data until script lifespan ends
     declare debugCounter; debugCounter="0"; # set debug counter
     timeStart=$(dateTimeShort); # Note start time
     while [[ "$SECONDS" -lt "$scriptTTL" ]]; do
 	# Determine file paths (time is start of buffer period)
-	FILEOUT_BASENAME="$timeStart""--""$bufferTTL_STR""..""$SCRIPT_HOSTNAME""_location" && vbm "Set FILEOUT_BASENAME to:$FILEOUT_BASENAME";
+	FILEOUT_BASENAME="$timeStart""--""$bufferTTL_STR""..""$SCRIPT_HOSTNAME""_location" && vbm "STATUS:Set FILEOUT_BASENAME to:$FILEOUT_BASENAME";
 	## Files saved to DIR_TMP
 	PATHOUT_NMEA="$DIR_TMP"/"$FILEOUT_BASENAME".nmea"$CMD_COMPRESS_SUFFIX""$CMD_ENCRYPT_SUFFIX" && vbm "STATUS:Set PATHOUT_NMEA to:$PATHOUT_NMEA";
 	PATHOUT_GPX="$DIR_TMP"/"$FILEOUT_BASENAME".gpx"$CMD_COMPRESS_SUFFIX""$CMD_ENCRYPT_SUFFIX" && vbm "STATUS:Set PATHOUT_GPX to:$PATHOUT_GPX";
@@ -729,11 +735,11 @@ main() {
 	## Files saved to disk (DIR_OUT)
 	### one file per day (Ex: "20200731..hostname_location.[.gpx.gz].tar")
 	PATHOUT_TAR="$DIR_OUT"/"$(dateShort)".."$SCRIPT_HOSTNAME""_location""$CMD_COMPRESS_SUFFIX""$CMD_ENCRYPT_SUFFIX".tar && \
-	    vbm "Set PATHOUT_TAR to:$PATHOUT_TAR"
+	    vbm "STATUS:Set PATHOUT_TAR to:$PATHOUT_TAR"
 	# Define GPS conversion commands
-	CMD_CONV_NMEA="tee /dev/null " && vbm "Set CMD_CONV_NMEA to:$CMD_CONV_NMEA"; # tee as passthrough
-	CMD_CONV_GPX="gpsbabel -i nmea -f - -o gpx -F - " && vbm "Set CMD_CONV_GPX to:$CMD_CONV_GPX"; # convert NMEA to GPX
-	CMD_CONV_KML="gpsbabel -i nmea -f - -o kml -F - " && vbm "Set CMD_CONV_KML to:$CMD_CONV_KML"; # convert NMEA to KML
+	CMD_CONV_NMEA="tee /dev/null " && vbm "STATUS:Set CMD_CONV_NMEA to:$CMD_CONV_NMEA"; # tee as passthrough
+	CMD_CONV_GPX="gpsbabel -i nmea -f - -o gpx -F - " && vbm "STATUS:Set CMD_CONV_GPX to:$CMD_CONV_GPX"; # convert NMEA to GPX
+	CMD_CONV_KML="gpsbabel -i nmea -f - -o kml -F - " && vbm "STATUS:Set CMD_CONV_KML to:$CMD_CONV_KML"; # convert NMEA to KML
 	# Fill Bash variable buffer
 	bufferBash="$(timeout "$BUFFER_TTL""s" gpspipe -r)" && vbm "STATUS:Successfully filled bufferBash variable with gpspipe data."; # Record gpspipe nmea data to buffer for bufferTTL seconds
 	# Process bufferBash, save secured chunk set to DIR_TMP
@@ -742,11 +748,11 @@ main() {
 	echo "$bufferBash" | $CMD_CONV_GPX  | $CMD_COMPRESS | $CMD_ENCRYPT > "$PATHOUT_GPX" & # Create GPX file (secured if requested)
 	echo "$bufferBash" | $CMD_CONV_KML  | $CMD_COMPRESS | $CMD_ENCRYPT > "$PATHOUT_KML" & # Create KML file (secured if requested)
 	# Append each secured chunk in memory dir (DIR_TMP) to file on disk (PATHOUT_TAR in DIR_OUT)
-	vbm "DIR_TMP     :$DIR_TMP";
-	vbm "PATHOUT_TAR :$PATHOUT_TAR";
-	vbm "PATHOUT_NMEA:$PATHOUT_NMEA";
-	vbm "PATHOUT_NMEA:$PATHOUT_GPX";
-	vbm "PATHOUT_NMEA:$PATHOUT_KML";
+	vbm "STATUS:DIR_TMP     :$DIR_TMP";
+	vbm "STATUS:PATHOUT_TAR :$PATHOUT_TAR";
+	vbm "STATUS:PATHOUT_NMEA:$PATHOUT_NMEA";
+	vbm "STATUS:PATHOUT_NMEA:$PATHOUT_GPX";
+	vbm "STATUS:PATHOUT_NMEA:$PATHOUT_KML";
 	try tar --append --directory="$DIR_TMP" --file="$PATHOUT_TAR" "$(basename "$PATHOUT_NMEA")" && \
 	    vbm "DEBUG:Appended NMEA location data $PATHOUT_NMEA to $PATHOUT_TAR";
 	try tar --append --directory="$DIR_TMP" --file="$PATHOUT_TAR" "$(basename "$PATHOUT_GPX")" && \
@@ -754,7 +760,7 @@ main() {
 	try tar --append --directory="$DIR_TMP" --file="$PATHOUT_TAR" "$(basename "$PATHOUT_KML")" && \
 	    vbm "DEBUG:Appended KML location $PATHOUT_KML to $PATHOUT_TAR";
 	# Remove secured chunks from DIR_TMP
-	try rm "$PATHOUT_NMEA" "$PATHOUT_NMEA" "$PATHOUT_NMEA";
+	try rm "$PATHOUT_NMEA" "$PATHOUT_GPX" "$PATHOUT_KML";
 	# Reset buffer and filenames
 	unset bufferBash FILEOUT_BASENAME PATHOUT_NMEA PATHOUT_GPX PATHOUT_KML PATHOUT_TAR;
 	vbm "DEBUG:Completed buffer session $debugCounter ." 1>&2;