From: Steven Baltakatei Sandoval <baltakatei@gmail.com>
Date: Fri, 3 Jul 2020 20:31:53 +0000 (+0000)
Subject: fix(bkgpslog):Simplify main loop further
X-Git-Url: https://zdv2.bktei.com/gitweb/EVA-2020-02.git/commitdiff_plain/811f50f240ecce2696d0cc609fa6ca700a9b9e41?ds=inline;hp=-c

fix(bkgpslog):Simplify main loop further

Move `gpspipe` command itself into write function.
---

811f50f240ecce2696d0cc609fa6ca700a9b9e41
diff --git a/exec/bkgpslog b/exec/bkgpslog
index 67b8f90..3029dfc 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.4";          # Define version of script.
+SCRIPT_VERSION="0.3.5";          # 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)
@@ -843,14 +843,17 @@ magicWriteVersion() {
     appendArgTar "$CONTENT_VERSION" "$FILEOUT_VERSION" "$PATHOUT_TAR" "$DIR_TMP";
     
 } # bkgpslog: write version data to PATHOUT_TAR via appendArgTar()
-magicWriteBuffer() {
+magicGatherWriteBuffer() {
     # Desc: bkgpslog-specific meta function for writing data to DIR_TMP then appending each file to PATHOUT_TAR
     # Inputs: PATHOUT_TAR FILEOUT_{NMEA,GPX,KML} CMD_CONV_{NMEA,GPX,KML} CMD_{COMPRESS,ENCRYPT} DIR_TMP,
     # Inputs: BUFFER_TTL bufferTTL_STR SCRIPT_HOSTNAME CMD_COMPRESS_SUFFIX CMD_ENCRYPT_SUFFIX
     # Depends: yell, try, vbm, appendArgTar, tar
     local FN="${FUNCNAME[0]}";
     wait; # Wait to avoid collision with older magicWriteBuffer() instances (see https://www.tldp.org/LDP/abs/html/x9644.html )
-
+    # Create buffer file with unique name
+    PATHOUT_BUFFER="$DIR_TMP/buffer$SECONDS";
+    # Fill buffer
+    timeout "$BUFFER_TTL"s gpspipe -r -o "$PATHOUT_BUFFER" ;
     timeBufferStart="$(dateTimeShort  "$(date --date="$BUFFER_TTL seconds ago")")"; # Note start time#TODO subtract BUFFER_TTL from current time
     vbm "DEBUG:STATUS:$FN:Started magicWriteBuffer().";
     # Determine file paths (time is start of buffer period)
@@ -986,18 +989,12 @@ main() {
     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
-    
+
     # MAIN LOOP:Record gps data until script lifespan ends
-    declare debugCounter; debugCounter="0"; # set debug counter
     while [[ "$SECONDS" -lt "$scriptTTL" ]]; do
-	# Create buffer file with unique name
-	PATHOUT_BUFFER="$DIR_TMP/buffer$debugCounter++";
-	# Fill Bash variable buffer
-	timeout "$BUFFER_TTL"s gpspipe -r -o "$PATHOUT_BUFFER" ;
-	# Process bufferBash, save secured chunk set to DIR_TMP
-	magicWriteBuffer &
-	((debugCounter++));
-    done
+	magicGatherWriteBuffer &
+	sleep "$BUFFER_TTL"
+    done    
 
     # Cleanup
     ## Remove DIR_TMP