fix(bkgpslog):Fix pubkey strings with spaces

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

diff --git a/exec/bkgpslog b/exec/bkgpslog
index 3029dfcc7ca47b73da5812662dbdd51a680bd051..50b83dcb6a5c382501bfcc9bb376d25fa4d82f43 100755 (executable)
--- 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_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.5";          # Define version of script.
+SCRIPT_VERSION="0.3.6";          # 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)
 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)


@@ -854,7 +854,7 @@ magicGatherWriteBuffer() {
     PATHOUT_BUFFER="$DIR_TMP/buffer$SECONDS";
     # Fill buffer
     timeout "$BUFFER_TTL"s gpspipe -r -o "$PATHOUT_BUFFER" ;
     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
+    timeBufferStart="$(dateTimeShort  "$(date --date="$BUFFER_TTL seconds ago")")"; # Note start time

     vbm "DEBUG:STATUS:$FN:Started magicWriteBuffer().";
     # Determine file paths (time is start of buffer period)
     FILEOUT_BASENAME="$timeBufferStart""--""$bufferTTL_STR""..""$SCRIPT_HOSTNAME""_location" && vbm "STATUS:Set FILEOUT_BASENAME to:$FILEOUT_BASENAME";
     vbm "DEBUG:STATUS:$FN:Started magicWriteBuffer().";
     # Determine file paths (time is start of buffer period)
     FILEOUT_BASENAME="$timeBufferStart""--""$bufferTTL_STR""..""$SCRIPT_HOSTNAME""_location" && vbm "STATUS:Set FILEOUT_BASENAME to:$FILEOUT_BASENAME";


@@ -924,10 +924,10 @@ main() {
     if [[ "$OPTION_ENCRYPT" = "true" ]]; then # Check if encryption option active.
        if checkapp age; then # Check that age is available.
            for pubkey in "${recPubKeys[@]}"; do # Validate recipient pubkey strings by forming test message
     if [[ "$OPTION_ENCRYPT" = "true" ]]; then # Check if encryption option active.
        if checkapp age; then # Check that age is available.
            for pubkey in "${recPubKeys[@]}"; do # Validate recipient pubkey strings by forming test message

-               vbm "DEBUG:Testing pubkey string:$pubkey"
+               vbm "DEBUG:Testing pubkey string:$pubkey";

                if echo "butts" | age -a -r "$pubkey" 1>/dev/null; then
                    #### Form age recipient string
                if echo "butts" | age -a -r "$pubkey" 1>/dev/null; then
                    #### Form age recipient string

-                   recipients="$recipients""-r $pubkey ";
+                   recipients="$recipients""-r \"$pubkey\" ";

                    vbm "STATUS:Added pubkey for forming age recipient string:""$pubkey";
                    vbm "DEBUG:recipients:""$recipients";
                    #### Add validated pubkey to recPubKeysValid array
                    vbm "STATUS:Added pubkey for forming age recipient string:""$pubkey";
                    vbm "DEBUG:recipients:""$recipients";
                    #### Add validated pubkey to recPubKeysValid array


@@ -993,7 +993,7 @@ main() {
     # MAIN LOOP:Record gps data until script lifespan ends
     while [[ "$SECONDS" -lt "$scriptTTL" ]]; do
        magicGatherWriteBuffer &
     # MAIN LOOP:Record gps data until script lifespan ends
     while [[ "$SECONDS" -lt "$scriptTTL" ]]; do
        magicGatherWriteBuffer &

-       sleep "$BUFFER_TTL"
+       sleep "$BUFFER_TTL";

     done    
 
     # Cleanup
     done    
 
     # Cleanup