From: Steven Baltakatei Sandoval <baltakatei@gmail.com>
Date: Sat, 4 Jul 2020 00:12:48 +0000 (+0000)
Subject: fix(unitproc):appendArgTar: Use 'eval' for command strings
X-Git-Tag: 0.3.0~67
X-Git-Url: https://zdv2.bktei.com/gitweb/BK-2020-03.git/commitdiff_plain/f05315988da133220f4b988feef9bc9657dce4ac?ds=sidebyside;hp=-c

fix(unitproc):appendArgTar: Use 'eval' for command strings

Fixes problem when constructed command string contains quotes.
---

f05315988da133220f4b988feef9bc9657dce4ac
diff --git a/unitproc/bktemp-appendArgTar b/unitproc/bktemp-appendArgTar
index 5d42dc2..fedd668 100644
--- a/unitproc/bktemp-appendArgTar
+++ b/unitproc/bktemp-appendArgTar
@@ -8,7 +8,7 @@ try() { "$@" || die "cannot $*"; }
 appendArgTar(){
     # Desc: Writes first argument to temporary file with arguments as options, then appends file to tar
     # Usage: appendArgTar "$(echo "Data to be written.")" [name of file to be inserted] [tar path] [temp dir] ([cmd1] [cmd2] [cmd3] [cmd4]...)
-    # Version: 1.0.2
+    # Version: 1.0.3
     # Input: arg1: data to be written
     #        arg2: file name of file to be inserted into tar
     #        arg3: tar archive path (must exist first)
@@ -20,6 +20,7 @@ appendArgTar(){
     #          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
+    # Ref/Attrib: Using 'eval' to construct command strings https://askubuntu.com/a/476533
 
     # Save function name
     local FN="${FUNCNAME[0]}";
@@ -40,7 +41,11 @@ 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
 
+    # Input command
+    CMD0="echo \"\$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"
@@ -50,7 +55,7 @@ appendArgTar(){
     # yell "DEBUG:STATUS:$FN:TMP_DIR:$TMP_DIR"
     
     # Write to temporary working dir
-    echo "$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";