fix(bkgpslog):Fix malformed variable in output filename

[EVA-2020-02.git] / exec / bkgpslog

diff --git a/exec/bkgpslog b/exec/bkgpslog
index a1fd8ceeedaae511cf1a4dd12bc0b33ca55bfc64..215dd7bbf8effe98a81e91e062d1aaaf69d4fcfd 100755 (executable)
--- a/exec/bkgpslog
+++ b/exec/bkgpslog
@@ -241,20 +241,17 @@ main() {
        declare debugCounter; debugCounter="0"
        while [[ "$SECONDS" -lt "$scriptTTL" ]]; do
            ((debugCounter++))
        declare debugCounter; debugCounter="0"
        while [[ "$SECONDS" -lt "$scriptTTL" ]]; do
            ((debugCounter++))

-           # Fill buffer
-           buffer="$(timeout "$bufferTTL""s" gpspipe -r)"; # Record gpspipe nmea data to buffer for bufferTTL seconds
-           # Process buffer
-           buffer_GPX="$(echo "$buffer" | gpsbabel -i nmea -f - -o gpx -F - )"; # Convert buffer to GPX format
-           buffer_KML="$(echo "$buffer" | gpsbabel -i nmea -f - -o kml -F - )"; # Convert buffer to KML format
-           # Determine output file paths
-           FILEOUT_BASENAME="$(dateTimeShort)".."$SCRIPT_HOSTNAME"_location ;
+           # Determine output file paths (time is start of buffer period)
+           FILEOUT_BASENAME="$(dateTimeShort)""--P""$bufferTTL""S..""$SCRIPT_HOSTNAME""_location" ; # ISO-8601 YYYYmmddTHHMMSS+zzP[$bufferTTL]S

            FILEOUT_NMEA="$FILEOUT_BASENAME".nmea ;
            FILEOUT_GPX="$FILEOUT_BASENAME".gpx ;
            FILEOUT_KML="$FILEOUT_BASENAME".kml ;
            FILEOUT_NMEA="$FILEOUT_BASENAME".nmea ;
            FILEOUT_GPX="$FILEOUT_BASENAME".gpx ;
            FILEOUT_KML="$FILEOUT_BASENAME".kml ;

-           # Save processed buffer data
-           echo "$buffer"     > "$DIROUT"/"$FILEOUT_NMEA"; # Save NMEA format
-           echo "$buffer_GPX" > "$DIROUT"/"$FILEOUT_GPX"; # Save GPX format
-           echo "$buffer_KML" > "$DIROUT"/"$FILEOUT_KML"; # Save KML format
+           # Fill buffer
+           buffer="$(timeout "$bufferTTL""s" gpspipe -r)"; # Record gpspipe nmea data to buffer for bufferTTL seconds
+           # Process and save buffers
+           echo "$buffer"                                     > "$DIROUT"/"$FILEOUT_NMEA" & # Save NMEA format
+           echo "$buffer" | gpsbabel -i nmea -f - -o gpx -F - > "$DIROUT"/"$FILEOUT_GPX"  & # Save GPX format
+           echo "$buffer" | gpsbabel -i nmea -f - -o kml -F - > "$DIROUT"/"$FILEOUT_KML"  & # Save KML format

            vbm "DEBUG:Completed buffer session $debugCounter ." 1>&2;
            # Reset buffer and filenames
            unset buffer buffer_GPX buffer_KML FILEOUT_BASENAME FILEOUT_NMEA FILEOUT_GPX FILEOUT_KML;
            vbm "DEBUG:Completed buffer session $debugCounter ." 1>&2;
            # Reset buffer and filenames
            unset buffer buffer_GPX buffer_KML FILEOUT_BASENAME FILEOUT_NMEA FILEOUT_GPX FILEOUT_KML;