--- a/tools/update-packaging/common.sh
+++ b/tools/update-packaging/common.sh
@@ -85,17 +85,17 @@ make_add_instruction() {
     notice "     add-if \"$testdir\" \"$f\""
     echo "add-if \"$testdir\" \"$f\"" >> "$filev2"
     if [ ! $filev3 = "" ]; then
       echo "add-if \"$testdir\" \"$f\"" >> "$filev3"
     fi
   else
     notice "        add \"$f\"$forced"
     echo "add \"$f\"" >> "$filev2"
-    if [ ! $filev3 = "" ]; then
+    if [ ! "$filev3" = "" ]; then
       echo "add \"$f\"" >> "$filev3"
     fi
   fi
 }
 
 check_for_add_if_not_update() {
   add_if_not_file_chk="$1"
 
@@ -119,17 +119,17 @@ check_for_add_to_manifestv2() {
   return 1;
 }
 
 make_add_if_not_instruction() {
   f="$1"
   filev3="$2"
 
   notice " add-if-not \"$f\" \"$f\""
-  echo "add-if-not \"$f\" \"$f\"" >> $filev3
+  echo "add-if-not \"$f\" \"$f\"" >> "$filev3"
 }
 
 make_patch_instruction() {
   f="$1"
   filev2="$2"
   filev3="$3"
 
   is_extension=$(echo "$f" | grep -c 'distribution/extensions/.*/')