test(bkgpslog):Group all processing and save commands

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

diff --git a/exec/bkgpslog b/exec/bkgpslog
index f7d1b187e7951736051281191349124803e57898..2123076a2bea8f7a8816658a8e1b62f2f543814a 100755 (executable)
--- a/exec/bkgpslog
+++ b/exec/bkgpslog
@@ -308,6 +308,7 @@ main() {
            CMD_COMPRESS_SUFFIX=".gz";
        else
            yell "ERROR:Compression enabled but \"gzip\" not found. Exiting."; exit 1;
            CMD_COMPRESS_SUFFIX=".gz";
        else
            yell "ERROR:Compression enabled but \"gzip\" not found. Exiting."; exit 1;

+       fi

     else
        CMD_COMPRESS="";
        CMD_COMPRESS_SUFFIX="";
     else
        CMD_COMPRESS="";
        CMD_COMPRESS_SUFFIX="";


@@ -347,12 +348,20 @@ main() {
            FILEOUT_NMEA="$FILEOUT_BASENAME".nmea"$CMD_COMPRESS_SUFFIX""$CMD_ENCRYPT_SUFFIX" ;
            FILEOUT_GPX="$FILEOUT_BASENAME".gpx"$CMD_COMPRESS_SUFFIX""$CMD_ENCRYPT_SUFFIX" ;
            FILEOUT_KML="$FILEOUT_BASENAME".kml"$CMD_COMPRESS_SUFFIX""$CMD_ENCRYPT_SUFFIX" ;
            FILEOUT_NMEA="$FILEOUT_BASENAME".nmea"$CMD_COMPRESS_SUFFIX""$CMD_ENCRYPT_SUFFIX" ;
            FILEOUT_GPX="$FILEOUT_BASENAME".gpx"$CMD_COMPRESS_SUFFIX""$CMD_ENCRYPT_SUFFIX" ;
            FILEOUT_KML="$FILEOUT_BASENAME".kml"$CMD_COMPRESS_SUFFIX""$CMD_ENCRYPT_SUFFIX" ;

+           # Define GPS conversion commands
+           CMD_CONV_NMEA=""
+           CMD_CONV_GPX=" | gpsbabel -i nmea -f - -o gpx -F - "
+           CMD_CONV_KML=" | gpsbabel -i nmea -f - -o kml -F - "

            # Fill buffer
            buffer="$(timeout "$bufferTTL""s" gpspipe -r)"; # Record gpspipe nmea data to buffer for bufferTTL seconds
            # Fill buffer
            buffer="$(timeout "$bufferTTL""s" gpspipe -r)"; # Record gpspipe nmea data to buffer for bufferTTL seconds

-           # Process and save buffers
-           echo "$buffer"                                     "$CMD_COMPRESS" "$CMD_ENCRYPT" > "$DIROUT"/"$FILEOUT_NMEA" & # Save NMEA format
-           echo "$buffer" | gpsbabel -i nmea -f - -o gpx -F - "$CMD_COMPRESS" "$CMD_ENCRYPT" > "$DIROUT"/"$FILEOUT_GPX" & # Save GPX format
-           echo "$buffer" | gpsbabel -i nmea -f - -o kml -F - "$CMD_COMPRESS" "$CMD_ENCRYPT" > "$DIROUT"/"$FILEOUT_KML" & # Save KML format
+           # Construct processing and save command string
+           CMD_NMEA=" echo \"\$buffer\" $CMD_CONV_NMEA $CMD_COMPRESS $CMD_ENCRYPT > $DIROUT/$FILEOUT_NMEA"; vbm "DEBUG:CMD_NMEA:$CMD_NMEA"
+           CMD_GPX="  echo \"\$buffer\" $CMD_CONV_GPX  $CMD_COMPRESS $CMD_ENCRYPT > $DIROUT/$FILEOUT_GPX";  vbm "DEBUG:CMD_GPX:$CMD_GPX"
+           CMD_KML="  echo \"\$buffer\" $CMD_CONV_KML  $CMD_COMPRESS $CMD_ENCRYPT > $DIROUT/$FILEOUT_KML";  vbm "DEBUG:CMD_KML:$CMD_KML"
+           # Execute processing and save command string
+           $CMD_NMEA & # Save NMEA format
+           $CMD_GPX & # Save GPX format
+           $CMD_KML & # Save KML format

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