projects
/
EVA-2020-02.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
debug(bkgpslog):Add debug messages for functions
[EVA-2020-02.git]
/
exec
/
bkgpslog
diff --git
a/exec/bkgpslog
b/exec/bkgpslog
index bc716d8b5e7b10fce5c112adf1171202d1b56dee..42d58247af732c6519456c9585d571339d413807 100755
(executable)
--- 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" &
# 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
# Depends: bash 5
+ # Save function name
+ local FN="${FUNCNAME[0]}"
+ yell "DEBUG:STATUS:$FN:Finished appendArgTar()."
+
# Set file name
# 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
# 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
# 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
# Set command strings
if ! [ -z "$5" ]; then CMD1="$5"; else CMD1="tee /dev/null "; fi # command string 1
@@
-644,22
+647,28
@@
appendArgTar(){
if ! [ -z "$8" ]; then CMD4="$8"; else CMD4="tee /dev/null "; fi # command string 4
# Debug
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";
# 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
} # 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_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
+ yell "DEBUG:STATUS:$FN:Finished magicWriteBuffer()."
} # bkgpslog write function
} # bkgpslog write function