X-Git-Url: https://zdv2.bktei.com/gitweb/EVA-2020-02.git/blobdiff_plain/66af62254cbae8f201f423cc41090408ac56a164..8e83fee84086f281e73c5891504419c7956601cf:/exec/bkgpslog?ds=inline diff --git a/exec/bkgpslog b/exec/bkgpslog index bc716d8..705d3c3 100755 --- a/exec/bkgpslog +++ b/exec/bkgpslog @@ -625,17 +625,20 @@ appendArgTar(){ # appendArgTar "$(cat /tmp/largefile1.gpg)" "largefile1" $HOME/archive.tar /tmp "gpg --decrypt" & # appendArgTar "$(cat /tmp/largefile2.gpg)" "largefile2" $HOME/archive.tar /tmp "gpg --decrypt" & # appendArgTar "$(cat /tmp/largefile3.gpg)" "largefile3" $HOME/archive.tar /tmp "gpg --decrypt" & - # Depends: bash 5 + # Save function name + local FN="${FUNCNAME[0]}" + yell "DEBUG:STATUS:$FN:Finished appendArgTar()." + # Set file name - if ! [ -z "$2" ]; then FILENAME="$2"; else yell "ERROR:Not enough arguments."; exit 1; fi + if ! [ -z "$2" ]; then FILENAME="$2"; else yell "ERROR:$FN:Not enough arguments."; exit 1; fi # Check tar path is a file - if [ -f "$3" ]; then TAR_PATH="$3"; else yell "ERROR:Tar archive arg not a file."; exit 1; fi + if [ -f "$3" ]; then TAR_PATH="$3"; else yell "ERROR:$FN:Tar archive arg not a file."; exit 1; fi # Check temp dir arg - if ! [ -z "$4" ]; then TMP_DIR="$3"; else yell "ERROR:No temporary working dir set."; exit 1; fi + if ! [ -z "$4" ]; then TMP_DIR="$4"; else yell "ERROR:$FN:No temporary working dir set."; exit 1; fi # Set command strings if ! [ -z "$5" ]; then CMD1="$5"; else CMD1="tee /dev/null "; fi # command string 1 @@ -644,22 +647,30 @@ appendArgTar(){ if ! [ -z "$8" ]; then CMD4="$8"; else CMD4="tee /dev/null "; fi # command string 4 # Debug - yell "CMD1:$CMD1" - yell "CMD2:$CMD2" - yell "CMD3:$CMD3" - yell "CMD4:$CMD4" + yell "STATUS:$FN:CMD1:$CMD1" + yell "STATUS:$FN:CMD2:$CMD2" + yell "STATUS:$FN:CMD3:$CMD3" + yell "STATUS:$FN:CMD4:$CMD4" + yell "STATUS:$FN:FILENAME:$FILENAME" + yell "STATUS:$FN:TAR_PATH:$TAR_PATH" + yell "STATUS:$FN:TMP_DIR:$TMP_DIR" # Write to temporary working dir echo "$1" | $CMD1 | $CMD2 | $CMD3 | $CMD4 > "$TMP_DIR"/"$FILENAME"; # Append to tar try tar --append --directory="$TMP_DIR" --file="$TAR_PATH" "$FILENAME"; - + yell "DEBUG:STATUS:$FN:Finished 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()." 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_NMEA" "$CMD_COMPRESS" "$CMD_ENCRYPT"; # Write GPX file - appendArgTar "$bufferBash" "$FILEOUT_KML" "$PATHOUT_TAR" "$DIR_TMP" "$CMD_CONV_NMEA" "$CMD_COMPRESS" "$CMD_ENCRYPT"; # Write KML file + 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()." } # bkgpslog write function @@ -811,14 +822,13 @@ main() { 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"; - # Remove secured chunks from DIR_TMP - try rm "$PATHOUT_NMEA" "$PATHOUT_GPX" "$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; vbm "DEBUG:Completed buffer session $debugCounter ." 1>&2;