From: Steven Baltakatei Sandoval Date: Thu, 2 Jul 2020 14:54:12 +0000 (+0000) Subject: debug(bkgpslog):Minor syntax formatting: add semicolons X-Git-Url: https://zdv2.bktei.com/gitweb/EVA-2020-02.git/commitdiff_plain/1b0e622772dd3a08ccce04a0fb201ec18b6a079d?ds=sidebyside;hp=--cc debug(bkgpslog):Minor syntax formatting: add semicolons --- 1b0e622772dd3a08ccce04a0fb201ec18b6a079d diff --git a/exec/bkgpslog b/exec/bkgpslog index 705d3c3..6308e09 100755 --- a/exec/bkgpslog +++ b/exec/bkgpslog @@ -663,14 +663,14 @@ appendArgTar(){ } # Append Bash var to file appended to Tar archive magicWriteBuffer() { # Desc: bkgpslog-specific meta function for writing data to DIR_TMP then appending each file to PATHOUT_TAR - local FN="${FUNCNAME[0]}" - yell "DEBUG:STATUS:$FN:Started magicWriteBuffer()." + local FN="${FUNCNAME[0]}"; + yell "DEBUG:STATUS:$FN:Started magicWriteBuffer()."; appendArgTar "$bufferBash" "$FILEOUT_NMEA" "$PATHOUT_TAR" "$DIR_TMP" "$CMD_CONV_NMEA" "$CMD_COMPRESS" "$CMD_ENCRYPT"; # Write NMEA data appendArgTar "$bufferBash" "$FILEOUT_GPX" "$PATHOUT_TAR" "$DIR_TMP" "$CMD_CONV_GPX" "$CMD_COMPRESS" "$CMD_ENCRYPT"; # Write GPX file appendArgTar "$bufferBash" "$FILEOUT_KML" "$PATHOUT_TAR" "$DIR_TMP" "$CMD_CONV_KML" "$CMD_COMPRESS" "$CMD_ENCRYPT"; # Write KML file # Remove secured chunks from DIR_TMP try rm "$PATHOUT_NMEA" "$PATHOUT_GPX" "$PATHOUT_KML"; - yell "DEBUG:STATUS:$FN:Finished magicWriteBuffer()." + yell "DEBUG:STATUS:$FN:Finished magicWriteBuffer()."; } # bkgpslog write function @@ -738,7 +738,7 @@ main() { else CMD_COMPRESS="tee /dev/null "; CMD_COMPRESS_SUFFIX=""; - vbm "DEBUG:Compression not enabled." + vbm "DEBUG:Compression not enabled."; fi # Check that critical apps and dirs are available, displag missing ones. @@ -771,14 +771,14 @@ main() { PATHOUT_APPENDTEST="$DIR_TMP"/"$FILEOUT_APPENDTEST" && \ vbm "DEBUG:Set PATHOUT_APPENDTEST to:$PATHOUT_APPENDTEST"; echo "$(dateTimeShort):""$(basename "$0")"" version $SCRIPT_VERSION resuming logging session." >> "$PATHOUT_APPENDTEST" && \ - vbm "DEBUG:""$PATHOUT_APPENDTEST"" created." + vbm "DEBUG:""$PATHOUT_APPENDTEST"" created."; if ! tar --append --directory="$DIR_TMP" --file="$PATHOUT_TAR" "$FILEOUT_APPENDTEST"; then ### If not appendable, label tar broken, move tar, proceed. mv "$PATHOUT_TAR" "${PATHOUT_TAR%.*}""-broken$(dateTimeShort)".tar && \ vbm "DEBUG:tar not writable, moving out of the way $PATHOUT_TAR"; fi else - vbm "STATUS:Output tar does not already exist. Creating:$PATHOUT_TAR" + vbm "STATUS:Output tar does not already exist. Creating:$PATHOUT_TAR"; ### If (no preexisting|appendable) tar found, create empty tar archive at PATHOUT_TAR try tar --create --directory="$DIR_TMP" --file="$PATHOUT_TAR" --files-from=/dev/null && \ vbm "DEBUG:Empty tar created at:$PATHOUT_TAR"; @@ -794,16 +794,16 @@ main() { # 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"; ## Files saved to DIR_TMP - FILEOUT_NMEA="$FILEOUT_BASENAME".nmea"$CMD_COMPRESS_SUFFIX""$CMD_ENCRYPT_SUFFIX" && vbm "STATUS:Set FILEOUT_NMEA to:$FILEOUT_NMEA" - FILEOUT_GPX="$FILEOUT_BASENAME".gpx"$CMD_COMPRESS_SUFFIX""$CMD_ENCRYPT_SUFFIX" && vbm "STATUS:Set FILEOUT_GPX to:$FILEOUT_GPX" - FILEOUT_KML="$FILEOUT_BASENAME".kml"$CMD_COMPRESS_SUFFIX""$CMD_ENCRYPT_SUFFIX" && vbm "STATUS:Set FILEOUT_KML to:$FILEOUT_KML" + FILEOUT_NMEA="$FILEOUT_BASENAME".nmea"$CMD_COMPRESS_SUFFIX""$CMD_ENCRYPT_SUFFIX" && vbm "STATUS:Set FILEOUT_NMEA to:$FILEOUT_NMEA"; + FILEOUT_GPX="$FILEOUT_BASENAME".gpx"$CMD_COMPRESS_SUFFIX""$CMD_ENCRYPT_SUFFIX" && vbm "STATUS:Set FILEOUT_GPX to:$FILEOUT_GPX"; + FILEOUT_KML="$FILEOUT_BASENAME".kml"$CMD_COMPRESS_SUFFIX""$CMD_ENCRYPT_SUFFIX" && vbm "STATUS:Set FILEOUT_KML to:$FILEOUT_KML"; PATHOUT_NMEA="$DIR_TMP"/"$FILEOUT_NMEA" && vbm "STATUS:Set PATHOUT_NMEA to:$PATHOUT_NMEA"; PATHOUT_GPX="$DIR_TMP"/"$FILEOUT_GPX" && vbm "STATUS:Set PATHOUT_GPX to:$PATHOUT_GPX"; PATHOUT_KML="$DIR_TMP"/"$FILEOUT_KML" && vbm "STATUS:Set PATHOUT_KML to:$PATHOUT_KML"; ## Files saved to disk (DIR_OUT) ### one file per day (Ex: "20200731..hostname_location.[.gpx.gz].tar") PATHOUT_TAR="$DIR_OUT"/"$(dateShort)".."$SCRIPT_HOSTNAME""_location""$CMD_COMPRESS_SUFFIX""$CMD_ENCRYPT_SUFFIX".tar && \ - vbm "STATUS:Set PATHOUT_TAR to:$PATHOUT_TAR" + vbm "STATUS:Set PATHOUT_TAR to:$PATHOUT_TAR"; # Define GPS conversion commands CMD_CONV_NMEA="tee /dev/null " && vbm "STATUS:Set CMD_CONV_NMEA to:$CMD_CONV_NMEA"; # tee as passthrough CMD_CONV_GPX="gpsbabel -i nmea -f - -o gpx -F - " && vbm "STATUS:Set CMD_CONV_GPX to:$CMD_CONV_GPX"; # convert NMEA to GPX @@ -813,21 +813,12 @@ main() { # Process bufferBash, save secured chunk set to DIR_TMP vbm "STATUS:Beginning to save data to $DIR_TMP"; magicWriteBuffer & - #echo "$bufferBash" | $CMD_CONV_NMEA | $CMD_COMPRESS | $CMD_ENCRYPT > "$PATHOUT_NMEA" & # Create NMEA file (secured if requested) - #echo "$bufferBash" | $CMD_CONV_GPX | $CMD_COMPRESS | $CMD_ENCRYPT > "$PATHOUT_GPX" & # Create GPX file (secured if requested) - #echo "$bufferBash" | $CMD_CONV_KML | $CMD_COMPRESS | $CMD_ENCRYPT > "$PATHOUT_KML" & # Create KML file (secured if requested) # Append each secured chunk in memory dir (DIR_TMP) to file on disk (PATHOUT_TAR in DIR_OUT) vbm "STATUS:DIR_TMP :$DIR_TMP"; vbm "STATUS:PATHOUT_TAR :$PATHOUT_TAR"; vbm "STATUS:PATHOUT_NMEA:$PATHOUT_NMEA"; vbm "STATUS:PATHOUT_GPX:$PATHOUT_GPX"; vbm "STATUS:PATHOUT_KML:$PATHOUT_KML"; - # try tar --append --directory="$DIR_TMP" --file="$PATHOUT_TAR" "$(basename "$PATHOUT_NMEA")" && \ - # vbm "DEBUG:Appended NMEA location data $PATHOUT_NMEA to $PATHOUT_TAR"; - # try tar --append --directory="$DIR_TMP" --file="$PATHOUT_TAR" "$(basename "$PATHOUT_GPX")" && \ - # vbm "DEBUG:Appended GPX location data $PATHOUT_GPX to $PATHOUT_TAR"; - # try tar --append --directory="$DIR_TMP" --file="$PATHOUT_TAR" "$(basename "$PATHOUT_KML")" && \ - # vbm "DEBUG:Appended KML location $PATHOUT_KML to $PATHOUT_TAR"; # Reset buffer and filenames unset bufferBash FILEOUT_BASENAME PATHOUT_NMEA PATHOUT_GPX PATHOUT_KML PATHOUT_TAR timeBufferStart; @@ -838,7 +829,7 @@ main() { # Remove DIR_TMP try rm -r "$DIR_TMP"; - vbm "STATUS:Main function finished." + vbm "STATUS:Main function finished."; } # Main function. #===END Declare local script functions=== #==END Define script parameters==