From 53728a7ff0c1ac16d7dddb827915390d2c59abe9 Mon Sep 17 00:00:00 2001
From: Jonas Weber <github@jonasw.de>
Date: Wed, 3 Oct 2018 19:38:47 +0200
Subject: [PATCH] Change backslash-dquote to single quote

Slightly breaking change, but improves security and readability.
---
 cdist/conf/type/__apt_ppa/gencode-remote      |  4 +--
 .../type/__ccollect_source/gencode-remote     | 14 +++++-----
 cdist/conf/type/__directory/gencode-remote    | 18 ++++++-------
 cdist/conf/type/__file/gencode-remote         | 14 +++++-----
 .../conf/type/__firewalld_rule/gencode-remote |  8 +++---
 .../gencode-remote                            |  2 +-
 cdist/conf/type/__package_apt/gencode-remote  |  4 +--
 .../conf/type/__package_emerge/gencode-remote |  4 +--
 .../type/__package_luarocks/gencode-remote    |  4 +--
 cdist/conf/type/__package_opkg/gencode-remote |  4 +--
 .../conf/type/__package_pacman/gencode-remote |  4 +--
 cdist/conf/type/__package_pip/gencode-remote  |  4 +--
 .../type/__package_rubygem/gencode-remote     |  4 +--
 cdist/conf/type/__package_yum/gencode-remote  |  4 +--
 .../conf/type/__package_zypper/gencode-remote |  6 ++---
 cdist/conf/type/__qemu_img/gencode-remote     |  2 +-
 .../conf/type/__start_on_boot/gencode-remote  | 26 +++++++++----------
 .../conf/type/__zypper_service/gencode-remote |  2 +-
 18 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/cdist/conf/type/__apt_ppa/gencode-remote b/cdist/conf/type/__apt_ppa/gencode-remote
index 25dec58d..84ebebfe 100755
--- a/cdist/conf/type/__apt_ppa/gencode-remote
+++ b/cdist/conf/type/__apt_ppa/gencode-remote
@@ -29,9 +29,9 @@ fi
 
 case "$state_should" in
    present)
-      echo "add-apt-repository \"$name\""
+      echo "add-apt-repository '$name'"
    ;;
    absent)
-      echo "remove-apt-repository \"$name\""
+      echo "remove-apt-repository '$name'"
    ;;
 esac
diff --git a/cdist/conf/type/__ccollect_source/gencode-remote b/cdist/conf/type/__ccollect_source/gencode-remote
index 5f2f97e3..5daa3fd3 100755
--- a/cdist/conf/type/__ccollect_source/gencode-remote
+++ b/cdist/conf/type/__ccollect_source/gencode-remote
@@ -42,18 +42,18 @@ get_current_value() {
 }
 
 set_group() {
-    echo chgrp \""$1"\" \""$destination"\"
-    echo chgrp "$1" >> "$__messages_out"
+    echo "chgrp '$1' '$destination'"
+    echo "chgrp '$1'" >> "$__messages_out"
 }
 
 set_owner() {
-    echo chown \""$1"\" \""$destination"\"
-    echo chown "$1" >> "$__messages_out"
+    echo "chown '$1' '$destination'"
+    echo "chown '$1'" >> "$__messages_out"
 }
 
 set_mode() {
-   echo chmod \""$1"\" \""$destination"\"
-   echo chmod "$1" >> "$__messages_out"
+   echo "chmod '$1' '$destination'"
+   echo "chmod '$1'" >> "$__messages_out"
 }
 
 set_attributes=
@@ -81,7 +81,7 @@ case "$state_should" in
 
     absent)
         if [ "$type" = "file" ]; then
-            echo rm -f \""$destination"\"
+            echo "rm -f '$destination'"
             echo remove >> "$__messages_out"
         fi
     ;;
diff --git a/cdist/conf/type/__directory/gencode-remote b/cdist/conf/type/__directory/gencode-remote
index 35866eb4..4220c6fb 100755
--- a/cdist/conf/type/__directory/gencode-remote
+++ b/cdist/conf/type/__directory/gencode-remote
@@ -57,18 +57,18 @@ get_current_value() {
 }
 
 set_group() {
-    echo chgrp "$recursive" \""$1"\" \""$destination"\"
-    echo chgrp "$recursive" "$1" >> "$__messages_out"
+    echo "chgrp '$recursive' '$1' '$destination'"
+    echo "chgrp '$recursive' '$1'" >> "$__messages_out"
 }
 
 set_owner() {
-    echo chown "$recursive" \""$1"\" \""$destination"\"
-    echo chown "$recursive" "$1" >> "$__messages_out"
+    echo "chown '$recursive' '$1' '$destination'"
+    echo "chown '$recursive' '$1'" >> "$__messages_out"
 }
 
 set_mode() {
-    echo chmod "$recursive" \""$1"\" \""$destination"\"
-    echo chmod "$recursive" "$1" >> "$__messages_out"
+    echo "chmod '$recursive' '$1' '$destination'"
+    echo "chmod '$recursive' '$1'" >> "$__messages_out"
 }
 
 case "$state_should" in
@@ -78,10 +78,10 @@ case "$state_should" in
          if [ "$type" != "none" ]; then
             # our destination is not a directory, remove whatever is there
             # and then create our directory and set all attributes
-            echo rm -f "\"$destination\""
+            echo "rm -f '$destination'"
             echo "remove non directory" >> "$__messages_out"
          fi
-         echo "mkdir $mkdiropt \"$destination\""
+         echo "mkdir $mkdiropt '$destination'"
          echo "create" >> "$__messages_out"
       fi
 
@@ -105,7 +105,7 @@ case "$state_should" in
    ;;
    absent)
         if [ "$type" = "directory" ]; then
-            echo rm -rf \""$destination"\"
+            echo "rm -rf '$destination'"
             echo remove >> "$__messages_out"
         fi
    ;;
diff --git a/cdist/conf/type/__file/gencode-remote b/cdist/conf/type/__file/gencode-remote
index ebc30fd9..ab9c2fd1 100755
--- a/cdist/conf/type/__file/gencode-remote
+++ b/cdist/conf/type/__file/gencode-remote
@@ -43,18 +43,18 @@ get_current_value() {
 }
 
 set_group() {
-    echo chgrp \""$1"\" \""$destination"\"
-    echo chgrp "$1" >> "$__messages_out"
+    echo "chgrp '$1' '$destination'"
+    echo "chgrp '$1'" >> "$__messages_out"
 }
 
 set_owner() {
-    echo chown \""$1"\" \""$destination"\"
-    echo chown "$1" >> "$__messages_out"
+    echo "chown '$1' '$destination'"
+    echo "chown '$1'" >> "$__messages_out"
 }
 
 set_mode() {
-   echo chmod \""$1"\" \""$destination"\"
-   echo chmod "$1" >> "$__messages_out"
+   echo "chmod '$1' '$destination'"
+   echo "chmod '$1'" >> "$__messages_out"
 }
 
 set_attributes=
@@ -82,7 +82,7 @@ case "$state_should" in
 
     absent)
         if [ "$type" = "file" ]; then
-            echo rm -f \""$destination"\"
+            echo "rm -f '$destination'"
             echo remove >> "$__messages_out"
         fi
     ;;
diff --git a/cdist/conf/type/__firewalld_rule/gencode-remote b/cdist/conf/type/__firewalld_rule/gencode-remote
index bc218d9a..225a0502 100755
--- a/cdist/conf/type/__firewalld_rule/gencode-remote
+++ b/cdist/conf/type/__firewalld_rule/gencode-remote
@@ -33,13 +33,13 @@ rule="$(cat "$__object/parameter/rule")"
 
 case "$state_should" in
     present)
-        echo "firewall-cmd --quiet --permanent --direct --add-rule \"$protocol\" \"$table\" \"$chain\" \"$priority\" $rule"
-        echo "firewall-cmd --quiet --direct --add-rule \"$protocol\" \"$table\" \"$chain\" \"$priority\" $rule"
+        echo "firewall-cmd --quiet --permanent --direct --add-rule '$protocol' '$table' '$chain' '$priority' $rule"
+        echo "firewall-cmd --quiet --direct --add-rule '$protocol' '$table' '$chain' '$priority' $rule"
     ;;
 
     absent)
-        echo "firewall-cmd --quiet --permanent --direct --remove-rule \"$protocol\" \"$table\" \"$chain\" \"$priority\" $rule"
-        echo "firewall-cmd --quiet --direct --remove-rule \"$protocol\" \"$table\" \"$chain\" \"$priority\" $rule"
+        echo "firewall-cmd --quiet --permanent --direct --remove-rule '$protocol' '$table' '$chain' '$priority' $rule"
+        echo "firewall-cmd --quiet --direct --remove-rule '$protocol' '$table' '$chain' '$priority' $rule"
     ;;
     *)
         echo "Unknown state $state_should" >&2
diff --git a/cdist/conf/type/__install_partition_msdos_apply/gencode-remote b/cdist/conf/type/__install_partition_msdos_apply/gencode-remote
index b8100c52..644de33c 100755
--- a/cdist/conf/type/__install_partition_msdos_apply/gencode-remote
+++ b/cdist/conf/type/__install_partition_msdos_apply/gencode-remote
@@ -85,7 +85,7 @@ primary_count=0
 for object in $objects; do
    device="$(cat "$object/parameter/device")"
    if [ "$current_device" != "$device" ]; then
-      echo "create_disklabel \"$device\" || die 'Failed to create disklabel for $device'"
+      echo "create_disklabel '$device' || die 'Failed to create disklabel for $device'"
       current_device="$device"
       device_name=$(echo "${device}" | sed -e 's:^/dev/::;s:/:\\/:g')
       available_device_size=$(( $(awk "/${device_name}\$/ { print \$3; }" "$partitions") / 1024))
diff --git a/cdist/conf/type/__package_apt/gencode-remote b/cdist/conf/type/__package_apt/gencode-remote
index cbe14787..699eb0c9 100755
--- a/cdist/conf/type/__package_apt/gencode-remote
+++ b/cdist/conf/type/__package_apt/gencode-remote
@@ -77,11 +77,11 @@ case "$state_should" in
         if [ -n "$version" ]; then
             name="${name}=${version}"
         fi
-        echo "$aptget install $target_release \"$name\""
+        echo "$aptget install $target_release '$name'"
         echo "installed" >> "$__messages_out"
     ;;
     absent)
-        echo "$aptget remove $purgeparam \"$name\""
+        echo "$aptget remove $purgeparam '$name'"
         echo "removed" >> "$__messages_out"
     ;;
     *)
diff --git a/cdist/conf/type/__package_emerge/gencode-remote b/cdist/conf/type/__package_emerge/gencode-remote
index ada2b414..8abcb5b1 100755
--- a/cdist/conf/type/__package_emerge/gencode-remote
+++ b/cdist/conf/type/__package_emerge/gencode-remote
@@ -63,10 +63,10 @@ fi
 
 case "$state_should" in
    present)
-        echo "emerge \"$name\" &>/dev/null || exit 1"
+        echo "emerge '$name' &>/dev/null || exit 1"
         ;;
    absent)
-        echo "emerge -C \"$name\" &>/dev/null || exit 1"
+        echo "emerge -C '$name' &>/dev/null || exit 1"
         ;;
    *)
         echo "Unknown state: $state_should" >&2
diff --git a/cdist/conf/type/__package_luarocks/gencode-remote b/cdist/conf/type/__package_luarocks/gencode-remote
index e14d7a8e..60b9bfea 100755
--- a/cdist/conf/type/__package_luarocks/gencode-remote
+++ b/cdist/conf/type/__package_luarocks/gencode-remote
@@ -42,10 +42,10 @@ fi
 
 case "$state_should" in
     present)
-        echo luarocks install \""$name"\"
+        echo "luarocks install '$name'"
     ;;
     absent)
-        echo luarocks remove \""$name"\"
+        echo "luarocks remove '$name'"
     ;;
     *)
         echo "Unknown state: $state_should" >&2
diff --git a/cdist/conf/type/__package_opkg/gencode-remote b/cdist/conf/type/__package_opkg/gencode-remote
index 53f154a5..7013ec9f 100755
--- a/cdist/conf/type/__package_opkg/gencode-remote
+++ b/cdist/conf/type/__package_opkg/gencode-remote
@@ -45,10 +45,10 @@ case "$state_should" in
         if [ "$present" = "notpresent" ]; then
             echo opkg --verbosity=0 update
         fi
-        echo opkg --verbosity=0 install \""$name"\"
+        echo "opkg --verbosity=0 install '$name'"
     ;;
     absent)
-        echo opkg --verbosity=0 remove \""$name"\"
+        echo "opkg --verbosity=0 remove '$name'"
     ;;
     *)
         echo "Unknown state: $state" >&2
diff --git a/cdist/conf/type/__package_pacman/gencode-remote b/cdist/conf/type/__package_pacman/gencode-remote
index 43649124..7ba85479 100755
--- a/cdist/conf/type/__package_pacman/gencode-remote
+++ b/cdist/conf/type/__package_pacman/gencode-remote
@@ -45,10 +45,10 @@ fi
 
 case "$state_should" in
    present)
-         echo pacman --needed --noconfirm --noprogressbar -S \""$name"\"
+         echo "pacman --needed --noconfirm --noprogressbar -S '$name'"
    ;;
    absent)
-         echo pacman --noconfirm --noprogressbar -R \""$name"\"
+         echo "pacman --noconfirm --noprogressbar -R '$name'"
    ;;
    *)
       echo "Unknown state: $state_should" >&2
diff --git a/cdist/conf/type/__package_pip/gencode-remote b/cdist/conf/type/__package_pip/gencode-remote
index 933406f2..33556bec 100755
--- a/cdist/conf/type/__package_pip/gencode-remote
+++ b/cdist/conf/type/__package_pip/gencode-remote
@@ -53,7 +53,7 @@ case "$state_should" in
     present)
         if [ "$runas" ]
         then
-            echo "su -c \"$pip install -q $name\" $runas"
+            echo "su -c '$pip install -q $name' $runas"
         else
             echo $pip install -q "$name"
         fi
@@ -61,7 +61,7 @@ case "$state_should" in
     absent)
         if [ "$runas" ]
         then
-            echo "su -c \"$pip uninstall -q -y $name\" $runas"
+            echo "su -c '$pip uninstall -q -y $name' $runas"
         else
             echo $pip uninstall -q -y "$name"
         fi
diff --git a/cdist/conf/type/__package_rubygem/gencode-remote b/cdist/conf/type/__package_rubygem/gencode-remote
index d474db20..ee563ef8 100755
--- a/cdist/conf/type/__package_rubygem/gencode-remote
+++ b/cdist/conf/type/__package_rubygem/gencode-remote
@@ -39,10 +39,10 @@ fi
 
 case "$state_should" in
     present)
-        echo gem install \""$name"\" --no-ri --no-rdoc
+        echo "gem install '$name' --no-ri --no-rdoc"
     ;;
     absent)
-        echo gem uninstall \""$name"\"
+        echo "gem uninstall '$name'"
     ;;
     *)
         echo "Unknown state: $state_should" >&2
diff --git a/cdist/conf/type/__package_yum/gencode-remote b/cdist/conf/type/__package_yum/gencode-remote
index d860c48c..97265827 100755
--- a/cdist/conf/type/__package_yum/gencode-remote
+++ b/cdist/conf/type/__package_yum/gencode-remote
@@ -60,10 +60,10 @@ fi
 
 case "$state_should" in
     present)
-        echo "yum $opts install \"$install_name\""
+        echo "yum $opts install '$install_name'"
     ;;
     absent)
-        echo "yum $opts remove \"$name\""
+        echo "yum $opts remove '$name'"
     ;;
     *)
         echo "Unknown state: $state_should" >&2
diff --git a/cdist/conf/type/__package_zypper/gencode-remote b/cdist/conf/type/__package_zypper/gencode-remote
index 5b1b763e..1f15c531 100755
--- a/cdist/conf/type/__package_zypper/gencode-remote
+++ b/cdist/conf/type/__package_zypper/gencode-remote
@@ -61,15 +61,15 @@ case "$state_should" in
     present)
         if [ -z "$version_should" ]; then
             [ "$state_is" = "present" ] && exit 0 # if state is present, we dont need to do anything
-            echo "zypper $globalopts install --type \"$ptype\" --auto-agree-with-licenses \"$name\" >/dev/null"
+            echo "zypper $globalopts install --type '$ptype' --auto-agree-with-licenses '$name' >/dev/null"
         else
             [ "$state_is" = "present" ] && [ "$version_should" = "$version_is" ] && exit 0 # if state is present and version is correct, we dont need to do anything
-            echo "zypper $globalopts install --oldpackage --type \"$ptype\" --auto-agree-with-licenses \"$name\" = \"$version_should\" >/dev/null"
+            echo "zypper $globalopts install --oldpackage --type '$ptype' --auto-agree-with-licenses '$name' = '$version_should' >/dev/null"
         fi
     ;;
     absent)
         [ "$state_is" = "absent" ] && exit 0 # if state is absent, we dont need to do anything
-        echo "zypper $globalopts remove --type \"$ptype\" \"$name\" >/dev/null"
+        echo "zypper $globalopts remove --type '$ptype' '$name' >/dev/null"
     ;;
     *)
         echo "Unknown state: $state_should" >&2
diff --git a/cdist/conf/type/__qemu_img/gencode-remote b/cdist/conf/type/__qemu_img/gencode-remote
index 95d07b7a..94816f58 100755
--- a/cdist/conf/type/__qemu_img/gencode-remote
+++ b/cdist/conf/type/__qemu_img/gencode-remote
@@ -18,4 +18,4 @@ format="$(cat "$__object/parameter/format")"
 size="$(cat "$__object/parameter/size")"
 diskimage="/$__object_id"
 
-echo "qemu-img create -f \"$format\" \"$diskimage\" \"$size\""
+echo "qemu-img create -f '$format' '$diskimage' '$size'"
diff --git a/cdist/conf/type/__start_on_boot/gencode-remote b/cdist/conf/type/__start_on_boot/gencode-remote
index 0ecea85b..122692ec 100755
--- a/cdist/conf/type/__start_on_boot/gencode-remote
+++ b/cdist/conf/type/__start_on_boot/gencode-remote
@@ -37,16 +37,16 @@ case "$state_should" in
         if [ "$init" = 'systemd' ]; then
             # this handles ALL linux distros with systemd
             # e.g. archlinux, gentoo in some cases, new RHEL and SLES versions
-            echo "systemctl -q enable \"$name\""
+            echo "systemctl -q enable '$name'"
         else
             case "$os" in
                 debian)
                     case "$os_version" in
                         [1-7]*)
-                            echo "update-rc.d \"$name\" defaults >/dev/null"
+                            echo "update-rc.d '$name' defaults >/dev/null"
                         ;;
                         8*)
-                            echo "systemctl enable \"$name\""
+                            echo "systemctl enable '$name'"
                         ;;
                         *)
                             echo "Unsupported version $os_version of $os" >&2
@@ -55,26 +55,26 @@ case "$state_should" in
                     esac
                 ;;
                 devuan)
-                    echo "update-rc.d \"$name\" defaults >/dev/null"
+                    echo "update-rc.d '$name' defaults >/dev/null"
                 ;;
 
                 gentoo)
-                    echo "rc-update add \"$name\" \"$target_runlevel\""
+                    echo "rc-update add '$name' '$target_runlevel'"
                 ;;
 
                 amazon|scientific|centos|fedora|owl|redhat|suse)
-                    echo "chkconfig \"$name\" on"
+                    echo "chkconfig '$name' on"
                 ;;
 
                 openwrt)
                     # 'enable' can be successful and still return a non-zero exit
                     # code, deal with it by checking for success ourselves in that
                     # case (the || ... part).
-                    echo "/etc/init.d/\"$name\" enable || [ -f /etc/rc.d/S??\"$name\" ]"
+                    echo "'/etc/init.d/$name' enable || [ -f /etc/rc.d/S??'$name' ]"
                 ;;
 
                 ubuntu)
-                    echo "update-rc.d \"$name\" defaults >/dev/null"
+                    echo "update-rc.d '$name' defaults >/dev/null"
                 ;;
 
                 freebsd)
@@ -93,24 +93,24 @@ case "$state_should" in
         if [ "$init" = 'systemd' ]; then
             # this handles ALL linux distros with systemd
             # e.g. archlinux, gentoo in some cases, new RHEL and SLES versions
-            echo "systemctl -q disable \"$name\""
+            echo "systemctl -q disable '$name'"
 
         else
             case "$os" in
                 debian|ubuntu|devuan)
-                    echo "update-rc.d -f \"$name\" remove"
+                    echo "update-rc.d -f '$name' remove"
                 ;;
 
                 gentoo)
-                    echo "rc-update del \"$name\"  \"$target_runlevel\""
+                    echo "rc-update del '$name' '$target_runlevel'"
                 ;;
 
                 centos|fedora|owl|redhat|suse)
-                    echo "chkconfig \"$name\" off"
+                    echo "chkconfig '$name' off"
                 ;;
 
                 openwrt)
-                    echo "\"/etc/init.d/$name\" disable"
+                    echo "'/etc/init.d/$name' disable"
                 ;;
 
                 *)
diff --git a/cdist/conf/type/__zypper_service/gencode-remote b/cdist/conf/type/__zypper_service/gencode-remote
index 6701347f..59ffc942 100755
--- a/cdist/conf/type/__zypper_service/gencode-remote
+++ b/cdist/conf/type/__zypper_service/gencode-remote
@@ -71,7 +71,7 @@ fi
 
 case "$state_should" in
    present)
-         echo "zypper $zypper_def_opts addservice -t $stype $uri \"$desc\""
+         echo "zypper $zypper_def_opts addservice -t $stype $uri '$desc'"
          echo "zypper $zypper_def_opts refs"
          echo "zypper $zypper_def_opts ref"
    ;;