X-Git-Url: https://zdv2.bktei.com/gitweb/EVA-2020-02.git/blobdiff_plain/f7f33d336aea39518053970d7ecba1e59f592eee..1f2681284c87d5cde538a0eb18c49b0916b9743e:/exec/bkgpslog?ds=inline diff --git a/exec/bkgpslog b/exec/bkgpslog index 2eed9ba..840a0c6 100755 --- a/exec/bkgpslog +++ b/exec/bkgpslog @@ -214,9 +214,9 @@ processArguments() { -r | --recipient) # Add 'age' recipient via public key string recPubKeys+=("$2"); vbm "pubkey added:""$2"; shift;; -c | --compress) OPTION_COMPRESS="true"; vbm "DEBUG:Compressed output mode enabled.";; - -z | --time-zone) try setTimeZoneEV "$1";; - -t | --temp-dir) OPTION_TMPDIR="true" && TMP_DIR_PRIORITY="$1";; - *) echoerr "ERROR: Unrecognized argument."; exit 1;; # Handle unrecognized options. + -z | --time-zone) try setTimeZoneEV "$2"; shift;; + -t | --temp-dir) OPTION_TMPDIR="true" && TMP_DIR_PRIORITY="$2"; shift;; + *) echoerr "ERROR: Unrecognized argument: $1"; echoerr "STATUS:All arguments:$*"; exit 1;; # Handle unrecognized options. esac shift done @@ -698,8 +698,19 @@ main() { PATHOUT_TAR="$DIR_OUT"/"$(dateShort)".."$SCRIPT_HOSTNAME""_location""$CMD_COMPRESS_SUFFIX""$CMD_ENCRYPT_SUFFIX".tar ## Write bkgpslog version to DIR_TMP/VERSION echo "$0"" Version:""$SCRIPT_VERSION" >> "$DIR_TMP/VERSION" && vbm "DEBUG:VERSION created." - ## Create empty tar archive at PATHOUT_TAR - try tar --create --directory="$DIR_TMP" --file="$PATHOUT_TAR" --files-from=/dev/null && vbm "DEBUG:""$PATHOUT_TAR"" created." + ## Check if PATHOUT_TAR already exists. + if [[ -f "$PATHOUT_TAR" ]]; then + ### Check if preexisting tar is appendable. + PATHOUT_APPENDTEST="$DIR_TMP"/"$(dateTimeShort)..append_test.txt" + echo "$(dateTimeShort)" >> "$PATHOUT_APPENDTEST"; && vbm "DEBUG:""$PATHOUT_APPENDTEST"" created." + if ! tar --append --directory="$DIR_TMP" --file="$PATHOUT_TAR" "$(basename "$PATHOUT_APPENDTEST")"; then + ### If not appendable, label tar broken, move tar, proceed. + mv "$PATHOUT_TAR" "${PATHOUT_TAR%.*}""-broken$(dateTimeShort)".tar + fi + else + ### 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:""$PATHOUT_TAR"" created." + fi ## Append VERSION file to PATHOUT_TAR try tar --append --directory="$DIR_TMP" --file="$PATHOUT_TAR" "VERSION" && vbm "DEBUG:VERSION added to $PATHOUT_TAR"