From d7138c7fbf2bd7aadb9ccd22f85c227b9a59300d Mon Sep 17 00:00:00 2001 From: Steven Baltakatei Sandoval Date: Thu, 2 Jul 2020 22:12:58 +0000 Subject: [PATCH] style(bkgpslog):checkMakeTar():Add/remove debug code --- exec/bkgpslog | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/exec/bkgpslog b/exec/bkgpslog index 639a7a5..8b3b67e 100755 --- a/exec/bkgpslog +++ b/exec/bkgpslog @@ -670,6 +670,7 @@ checkMakeTar() { appendArgTar(){ # Desc: Writes first argument to temporary file with arguments as options, then appends file to tar # Usage: writeArg "$(echo "Data to be written.")" [name of file to be inserted] [tar path] [temp dir] ([cmd1] [cmd2] [cmd3] [cmd4]...) + # Version: 1.0.0 # Input: arg1: data to be written # arg2: file name of file to be inserted into tar # arg3: tar archive path (must exist first) @@ -683,8 +684,8 @@ appendArgTar(){ # Depends: bash 5 # Save function name - local FN="${FUNCNAME[0]}" - yell "DEBUG:STATUS:$FN:Finished appendArgTar()." + local FN="${FUNCNAME[0]}"; + #yell "DEBUG:STATUS:$FN:Finished appendArgTar()." # Set file name if ! [ -z "$2" ]; then FILENAME="$2"; else yell "ERROR:$FN:Not enough arguments."; exit 1; fi @@ -701,20 +702,21 @@ appendArgTar(){ if ! [ -z "$7" ]; then CMD3="$7"; else CMD3="tee /dev/null "; fi # command string 3 if ! [ -z "$8" ]; then CMD4="$8"; else CMD4="tee /dev/null "; fi # command string 4 - # Debug - 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" + # # Debug + # yell "DEBUG:STATUS:$FN:CMD1:$CMD1" + # yell "DEBUG:STATUS:$FN:CMD2:$CMD2" + # yell "DEBUG:STATUS:$FN:CMD3:$CMD3" + # yell "DEBUG:STATUS:$FN:CMD4:$CMD4" + # yell "DEBUG:STATUS:$FN:FILENAME:$FILENAME" + # yell "DEBUG:STATUS:$FN:TAR_PATH:$TAR_PATH" + # yell "DEBUG: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()." + #yell "DEBUG:STATUS:$FN:Finished appendArgTar()." } # Append Bash var to file appended to Tar archive magicWriteVersion() { # Desc: Appends time-stamped VERSION to PATHOUT_TAR -- 2.30.2