From e9b823bc390c30cb9294591c628c5353d194d0ef Mon Sep 17 00:00:00 2001
From: Darko Poljak <darko.poljak@gmail.com>
Date: Sun, 7 Oct 2018 09:59:01 +0200
Subject: [PATCH] Better fixes.

---
 cdist/conf/type/__cron/gencode-remote                  | 2 +-
 cdist/conf/type/__jail_freebsd10/gencode-remote        | 2 +-
 cdist/conf/type/__jail_freebsd9/gencode-remote         | 2 +-
 cdist/conf/type/__mount/gencode-remote                 | 2 +-
 cdist/conf/type/__package_pkgng_freebsd/gencode-remote | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cdist/conf/type/__cron/gencode-remote b/cdist/conf/type/__cron/gencode-remote
index ee626485..59398058 100755
--- a/cdist/conf/type/__cron/gencode-remote
+++ b/cdist/conf/type/__cron/gencode-remote
@@ -58,7 +58,7 @@ state_should="$(cat "$__object/parameter/state" 2>/dev/null || echo "present")"
 # These are the old markers
 prefix="#cdist:__cron/$__object_id"
 suffix="#/cdist:__cron/$__object_id"
-filter="^# DO NOT EDIT THIS FILE|^# \\(.* installed on |^# \\(Cron version V|^# \\(Cronie version .\\..\\)$"
+filter='^# DO NOT EDIT THIS FILE|^# \(.* installed on |^# \(Cron version V|^# \(Cronie version .\..\)$'
 cat << DONE
 crontab -u $user -l 2>/dev/null | grep -v -E "$filter" | awk -v prefix="$prefix" -v suffix="$suffix" '
 {
diff --git a/cdist/conf/type/__jail_freebsd10/gencode-remote b/cdist/conf/type/__jail_freebsd10/gencode-remote
index 73518326..4f376c25 100755
--- a/cdist/conf/type/__jail_freebsd10/gencode-remote
+++ b/cdist/conf/type/__jail_freebsd10/gencode-remote
@@ -45,7 +45,7 @@ else
 #    when $state=present, it's required. Enforce this.
    if [ "$state" = "present" ]; then
       exec >&2
-      echo "If --state is 'present,' --ip must be given\\!"
+      printf 'If --state is "present", --ip must be given\!\n'
       exit 1
    fi
 fi
diff --git a/cdist/conf/type/__jail_freebsd9/gencode-remote b/cdist/conf/type/__jail_freebsd9/gencode-remote
index be583e5d..68229d3e 100755
--- a/cdist/conf/type/__jail_freebsd9/gencode-remote
+++ b/cdist/conf/type/__jail_freebsd9/gencode-remote
@@ -45,7 +45,7 @@ else
 #    when $state=present, it's required. Enforce this.
    if [ "$state" = "present" ]; then
       exec >&2
-      echo "If --state is 'present,' --ip must be given\\!"
+      printf 'If --state is "present", --ip must be given\!\n'
       exit 1
    fi
 fi
diff --git a/cdist/conf/type/__mount/gencode-remote b/cdist/conf/type/__mount/gencode-remote
index e8266a0b..b2096764 100755
--- a/cdist/conf/type/__mount/gencode-remote
+++ b/cdist/conf/type/__mount/gencode-remote
@@ -39,7 +39,7 @@ case "$state_should" in
             printf ' -o %s' "$(cat "$__object/parameter/options")"
          fi
          printf ' %s' "$(cat "$__object/parameter/device")"
-         printf " %s\\n" "$path"
+         printf ' %s\n' "$path"
       else
          # mount using existing fstab entry
          printf 'mount "%s"\n' "$path"
diff --git a/cdist/conf/type/__package_pkgng_freebsd/gencode-remote b/cdist/conf/type/__package_pkgng_freebsd/gencode-remote
index 592d4d0f..b72544c1 100755
--- a/cdist/conf/type/__package_pkgng_freebsd/gencode-remote
+++ b/cdist/conf/type/__package_pkgng_freebsd/gencode-remote
@@ -95,7 +95,7 @@ if [ -n "$curr_version" ]; then  # PKG *is* installed
       if [ "$upgrade" = "true" ]; then
          execcmd "upg" "${cmd}"
       else
-         printf "Version %s is already installed and pkg-ng can't upgrade directly to version %s.\\nTo upgrade to the latest version, use the --upgrade flag.\\n" "$curr_version" "$version" >&2
+         printf 'Version %s is already installed and pkg-ng cannot upgrade directly to version %s.\nTo upgrade to the latest version, use the --upgrade flag.\n' "$curr_version" "$version" >&2
          exit 1
       fi
    # PKG is supposed to be installed to the latest version