feat(bkgpslog):Add ~/.local/bin to PATH

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

diff --git a/exec/bkgpslog b/exec/bkgpslog
index 2123076a2bea8f7a8816658a8e1b62f2f543814a..724b6e94a3cf1fef447c5d8122dad2cbdaadde76 100755 (executable)
--- a/exec/bkgpslog
+++ b/exec/bkgpslog
@@ -5,7 +5,7 @@
 # Usage: bkgpslog --output [output dir]
 
 #==BEGIN Define script parameters==
 # 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.
 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
            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_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_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_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
        CMD_COMPRESS_SUFFIX="";
        vbm "DEBUG:Compression not enabled."
     fi


@@ -349,19 +349,15 @@ main() {
            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
            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 - "
+           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
            # Fill buffer
            buffer="$(timeout "$bufferTTL""s" gpspipe -r)"; # Record gpspipe nmea data to buffer for bufferTTL seconds

-           # 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
            # Execute processing and save command string

-           $CMD_NMEA & # Save NMEA format
-           $CMD_GPX & # Save GPX format
-           $CMD_KML & # Save KML format
+           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;
            vbm "DEBUG:Completed buffer session $debugCounter ." 1>&2;
            # Reset buffer and filenames
            unset buffer FILEOUT_BASENAME FILEOUT_NMEA FILEOUT_GPX FILEOUT_KML;