From: Steven Baltakatei Sandoval Date: Wed, 1 Jul 2020 21:23:28 +0000 (+0000) Subject: fix(bkgpslog):Clean up how tar appended, version file included X-Git-Url: https://zdv2.bktei.com/gitweb/EVA-2020-02.git/commitdiff_plain/93b52b83baa80fd16a6d02e0bf2f60dcc55c239c?ds=sidebyside fix(bkgpslog):Clean up how tar appended, version file included --- diff --git a/exec/bkgpslog b/exec/bkgpslog index 1600716..babe06a 100755 --- a/exec/bkgpslog +++ b/exec/bkgpslog @@ -698,16 +698,19 @@ main() { PATHOUT_TAR="$DIR_OUT"/"$(dateShort)".."$SCRIPT_HOSTNAME""_location""$CMD_COMPRESS_SUFFIX""$CMD_ENCRYPT_SUFFIX".tar && \ vbm "STATUS:Set PATHOUT_TAR to:$PATHOUT_TAR"; ## Write bkgpslog version to DIR_TMP/VERSION - echo "$(dateTimeShort):$(basename "$0")"" Version:""$SCRIPT_VERSION" >> "$DIR_TMP/VERSION" && vbm "DEBUG:VERSION created."; + FILEOUT_VERSION="$(dateTimeShort)..VERSION"; + PATHOUT_VERSION="$DIR_TMP"/"$FILEOUT_VERSION"; + echo "$(dateTimeShort):$(basename "$0")"" Version:""$SCRIPT_VERSION" >> "$PATHOUT_VERSION" && vbm "DEBUG:VERSION created:$PATHOUT_VERSION"; ## Check if PATHOUT_TAR already exists. if [[ -f "$PATHOUT_TAR" ]]; then vbm "STATUS:Output tar already exists:$PATHOUT_TAR"; ### Check if preexisting tar is appendable. - PATHOUT_APPENDTEST="$DIR_TMP"/"$(dateTimeShort)..RESUMING_LOGGING_SESSION.txt" && \ + FILEOUT_APPENDTEST="$(dateTimeShort)..RESUMING_LOGGING_SESSION.txt"; + 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." - if ! tar --append --directory="$DIR_TMP" --file="$PATHOUT_TAR" "$(basename "$PATHOUT_APPENDTEST")"; then + 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"; @@ -719,7 +722,7 @@ main() { vbm "DEBUG:Empty tar created at:$PATHOUT_TAR"; fi ## Append VERSION file to PATHOUT_TAR - try tar --append --directory="$DIR_TMP" --file="$PATHOUT_TAR" "VERSION" && \ + try tar --append --directory="$DIR_TMP" --file="$PATHOUT_TAR" "$FILEOUT_VERSION" && \ vbm "DEBUG:VERSION added to $PATHOUT_TAR"; # Record gps data until script lifespan ends