X-Git-Url: https://zdv2.bktei.com/gitweb/EVA-2020-02.git/blobdiff_plain/286d9825e57eb5350a438f22403308f5fb43494d..abd68e662c16e798caf51fb5ecd76d74ca100290:/exec/bkgpslog

diff --git a/exec/bkgpslog b/exec/bkgpslog
index 7e6bf27..724b6e9 100755
--- a/exec/bkgpslog
+++ b/exec/bkgpslog
@@ -5,7 +5,7 @@
 # Usage: bkgpslog --output [output dir]
 
 #==BEGIN Define script parameters==
-PATH="/opt/bktei:$PATH"         # Add default baltakatei script install directory to PATH (necessary for other bk scripts)
+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="bkgpslog 0.0.1" # Define version of script.
 SCRIPT_TIME_SHORT="$(date +%Y%m%dT%H%M%S%z)" # Save current date & time in ISO-8601 format.
@@ -291,26 +291,26 @@ main() {
 	    done
 	    vbm "DEBUG:Finished processing recPubKeys array";
 	    # Form age command string
-	    CMD_ENCRYPT=" | age ""$recipients ";
+	    CMD_ENCRYPT="age ""$recipients ";
 	    CMD_ENCRYPT_SUFFIX=".age";
 	else
 	    yell "ERROR:Encryption enabled but \"age\" not found. Exiting."; exit 1;
 	fi
     else
-	CMD_ENCRYPT="";
+	CMD_ENCRYPT="tee /dev/null ";
 	CMD_ENCRYPT_SUFFIX="";
 	vbm "DEBUG:Encryption not enabled."
     fi
 
     if [[ "$OPTION_COMPRESS" = "true" ]]; then # Check if compression option active
 	if checkapp gzip; then # Check if gzip available
-	    CMD_COMPRESS=" | gzip ";
+	    CMD_COMPRESS="gzip ";
 	    CMD_COMPRESS_SUFFIX=".gz";
 	else
 	    yell "ERROR:Compression enabled but \"gzip\" not found. Exiting."; exit 1;
 	fi
     else
-	CMD_COMPRESS="";
+	CMD_COMPRESS="tee /dev/null ";
 	CMD_COMPRESS_SUFFIX="";
 	vbm "DEBUG:Compression not enabled."
     fi
@@ -348,12 +348,16 @@ 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" ;
+	    # Define GPS conversion commands
+	    CMD_CONV_NMEA="tee /dev/null "
+	    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
-	    # 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
+	    # Execute processing and save command string
+	    echo "$buffer" | $CMD_CONV_NMEA | $CMD_COMPRESS | $CMD_ENCRYPT > "$DIROUT"/"$FILEOUT_NMEA" & # Save NMEA format
+	    echo "$buffer" | $CMD_CONV_GPX  | $CMD_COMPRESS | $CMD_ENCRYPT > "$DIROUT"/"$FILEOUT_GPX" & # Save GPX format
+	    echo "$buffer" | $CMD_CONV_KML  | $CMD_COMPRESS | $CMD_ENCRYPT > "$DIROUT"/"$FILEOUT_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;