From: Steven Baltakatei Sandoval Date: Fri, 10 Jul 2020 04:18:17 +0000 (+0000) Subject: style(unitproc):appendFileTar():VAR_NAME to varName X-Git-Tag: 0.3.0~23 X-Git-Url: https://zdv2.bktei.com/gitweb/BK-2020-03.git/commitdiff_plain/c1b629d0acca3520ab0a1deb8e5b72ad977b592c?ds=sidebyside;hp=--cc style(unitproc):appendFileTar():VAR_NAME to varName --- c1b629d0acca3520ab0a1deb8e5b72ad977b592c diff --git a/unitproc/bktemp-appendFileTar b/unitproc/bktemp-appendFileTar index 36e6942..46727ca 100644 --- a/unitproc/bktemp-appendFileTar +++ b/unitproc/bktemp-appendFileTar @@ -8,7 +8,7 @@ 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 + # Version: 1.0.3 # 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) @@ -19,51 +19,55 @@ appendFileTar(){ # 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, tar 1, 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:Finished 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 1 + if ! [ -z "$6" ]; then cmd2="$6"; else cmd2="cat "; fi # command string 2 + if ! [ -z "$7" ]; then cmd3="$7"; else cmd3="cat "; fi # command string 3 + if ! [ -z "$8" ]; then cmd4="$8"; else cmd4="cat "; fi # command string 4 # Input command string - CMD0="cat \"\$1\"" + 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" + # 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:tarPath:$tarPath" + # yell "DEBUG:STATUS:$fn:tmpDir:$tmpDir" # Write to temporary working dir - eval "$CMD0 | $CMD1 | $CMD2 | $CMD3 | $CMD4" > "$TMP_DIR"/"$FILENAME"; + eval "$cmd0 | $cmd1 | $cmd2 | $cmd3 | $cmd4" > "$tmpDir"/"$fileName"; # Append to tar - try tar --append --directory="$TMP_DIR" --file="$TAR_PATH" "$FILENAME"; - #yell "DEBUG:STATUS:$FN:Finished appendFileTar()." + try tar --append --directory="$tmpDir" --file="$tarPath" "$fileName"; + #yell "DEBUG:STATUS:$fn:Finished appendFileTar()." } # Append 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