X-Git-Url: https://zdv2.bktei.com/gitweb/BK-2020-03.git/blobdiff_plain/b8b1e3a2953e1fde7669868e6b3921c8648f0e37..9feacef475c65bc8affaf641922b32dbafbb7aa2:/unitproc/bktemp-appendFileTar?ds=sidebyside

diff --git a/unitproc/bktemp-appendFileTar b/unitproc/bktemp-appendFileTar
index 36e6942..04cda7c 100644
--- a/unitproc/bktemp-appendFileTar
+++ b/unitproc/bktemp-appendFileTar
@@ -1,69 +1,58 @@
 #!/bin/bash
-
-# Desc: Template function to write data supplied as argument
+# Desc: Append [processed] file to tar
 
 yell() { echo "$0: $*" >&2; } # Yell, Die, Try Three-Fingered Claw technique; # Ref/Attrib: https://stackoverflow.com/a/25515370
 die() { yell "$*"; exit 111; }
 try() { "$@" || die "cannot $*"; }
 appendFileTar(){
-    # Desc: Processes first file and then appends to tar
-    # Usage: appendFileTar [file path] [name of file to be inserted] [tar path] [temp dir] ([cmd1] [cmd2] [cmd3] [cmd4]...)
-    # Version: 1.0.2
+    # Desc: Appends [processed] file to tar
+    # Usage: appendFileTar [file path] [name of file to be inserted] [tar path] [temp dir] ([process cmd])
+    # Version: 2.0.1
     # Input: arg1: path of file to be (processed and) written
     #        arg2: name to use for file inserted into tar
     #        arg3: tar archive path (must exist first)
     #        arg4: temporary working dir
-    #        arg5+: command strings (ex: "gpsbabel -i nmea -f - -o kml -F - ")
+    #        arg5: (optional) command string to process file (ex: "gpsbabel -i nmea -f - -o kml -F - ")
     # Output: file written to disk
     # Example: decrypt multiple large files in parallel
     #          appendFileTar /tmp/largefile1.gpg "largefile1" $HOME/archive.tar /tmp "gpg --decrypt" &
     #          appendFileTar /tmp/largefile2.gpg "largefile2" $HOME/archive.tar /tmp "gpg --decrypt" &
     #          appendFileTar /tmp/largefile3.gpg "largefile3" $HOME/archive.tar /tmp "gpg --decrypt" &
-    # Depends: bash 5
+    # Depends: bash 5.0.3, tar 1.30, cat 8.30, yell()
+    local fn fileName tarPath tmpDir
 
     # Save function name
-    local FN="${FUNCNAME[0]}";
-    #yell "DEBUG:STATUS:$FN:Finished appendFileTar()."
+    fn="${FUNCNAME[0]}";
+    #yell "DEBUG:STATUS:$fn:Started appendFileTar()."
     
     # Set file name
-    if ! [ -z "$2" ]; then FILENAME="$2"; else yell "ERROR:$FN: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:$FN:Tar archive arg not a file."; exit 1; fi
+    if [ -f "$3" ]; then tarPath="$3"; else yell "ERROR:$fn:Tar archive arg not a file:$3"; exit 1; fi
     # Check temp dir arg
-    if ! [ -z "$4" ]; then TMP_DIR="$4"; else yell "ERROR:$FN:No temporary working dir set."; exit 1; fi
+    if ! [ -z "$4" ]; then tmpDir="$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
-    if ! [ -z "$6" ]; then CMD2="$6"; else CMD2="tee /dev/null "; fi # command string 2
-    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
+    if ! [ -z "$5" ]; then cmd1="$5"; else cmd1="cat "; fi # command string
 
     # Input command string
-    CMD0="cat \"\$1\""
-    
-    # # Debug
-    # yell "DEBUG:STATUS:$FN:CMD0:$CMD0"
-    # 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"
+    cmd0="cat \"\$1\"";
     
     # Write to temporary working dir
-    eval "$CMD0 | $CMD1 | $CMD2 | $CMD3 | $CMD4" > "$TMP_DIR"/"$FILENAME";
+    eval "$cmd0 | $cmd1" > "$tmpDir"/"$fileName";
 
     # Append to tar
-    try tar --append --directory="$TMP_DIR" --file="$TAR_PATH" "$FILENAME";
-    #yell "DEBUG:STATUS:$FN:Finished appendFileTar()."
-} # Append file to Tar archive
+    try tar --append --directory="$tmpDir" --file="$tarPath" "$fileName";
+    #yell "DEBUG:STATUS:$fn:Finished appendFileTar()."
+} # Append [processed] file to Tar archive
 
 #==BEGIN sample code==
 myTar="/tmp/$(date +%s).tar";
+myTmpDir="/dev/shm";
 try tar --create --file="$myTar" --files-from=/dev/null ;
-myFile="/tmp/$(date +%s)..original"
-echo "how are you doing?" > "$myFile"
-appendFileTar "$myFile" "$(date +%s)..LOUD_insidetar" "$myTar" "/dev/shm" "tee /tmp/$(date +%s)..outsidetar " "tr '[:lower:]' '[:upper:]'"
+myFile="/tmp/$(date +%s)..original";
+echo "how are you doing?" > "$myFile";
+appendFileTar "$myFile" "$(date +%s)..LOUD_insidetar" "$myTar" "$myTmpDir" "tee /tmp/$(date +%s)..outsidetar | tr '[:lower:]' '[:upper:]'" && \
+    echo "Inserted a processed version of $myFile into $myTar using temp dir $myTmpDir ";
 #==END sample code==
 
 # Author: Steven Baltakatei Sandoval