From b8b1e3a2953e1fde7669868e6b3921c8648f0e37 Mon Sep 17 00:00:00 2001 From: Steven Baltakatei Sandoval Date: Sat, 4 Jul 2020 00:20:22 +0000 Subject: [PATCH] fix(unitproc):appendFileTar: Use 'eval' to build cmd string Same change as to `appendArgTar()`. --- unitproc/bktemp-appendFileTar | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/unitproc/bktemp-appendFileTar b/unitproc/bktemp-appendFileTar index 7590d68..36e6942 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.1 + # Version: 1.0.2 # 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) @@ -36,7 +36,12 @@ appendFileTar(){ 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 + + # 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" @@ -46,7 +51,7 @@ appendFileTar(){ # yell "DEBUG:STATUS:$FN:TMP_DIR:$TMP_DIR" # Write to temporary working dir - cat "$1" | $CMD1 | $CMD2 | $CMD3 | $CMD4 > "$TMP_DIR"/"$FILENAME"; + eval "$CMD0 | $CMD1 | $CMD2 | $CMD3 | $CMD4" > "$TMP_DIR"/"$FILENAME"; # Append to tar try tar --append --directory="$TMP_DIR" --file="$TAR_PATH" "$FILENAME"; -- 2.30.2