From ebf0479f60f5c03eed0e8a3160e32ff8e3ec44e2 Mon Sep 17 00:00:00 2001
From: Antoine Catton <devel@antoine.catton.fr>
Date: Sat, 27 Dec 2014 20:44:47 -0700
Subject: [PATCH] DRY: Remove default parameter value handeling in
 __package_pkgng_freebsd

flavor, repo and version are expected to be empty by default.
They're all checked with [ -n "$var" ]
---
 .../__package_pkgng_freebsd/gencode-remote    | 20 ++++---------------
 .../parameter/default/flavor                  |  0
 .../parameter/default/repo                    |  0
 .../parameter/default/state                   |  1 +
 .../parameter/default/version                 |  0
 5 files changed, 5 insertions(+), 16 deletions(-)
 create mode 100644 cdist/conf/type/__package_pkgng_freebsd/parameter/default/flavor
 create mode 100644 cdist/conf/type/__package_pkgng_freebsd/parameter/default/repo
 create mode 100644 cdist/conf/type/__package_pkgng_freebsd/parameter/default/state
 create mode 100644 cdist/conf/type/__package_pkgng_freebsd/parameter/default/version

diff --git a/cdist/conf/type/__package_pkgng_freebsd/gencode-remote b/cdist/conf/type/__package_pkgng_freebsd/gencode-remote
index 39965aca..3c3e41e9 100755
--- a/cdist/conf/type/__package_pkgng_freebsd/gencode-remote
+++ b/cdist/conf/type/__package_pkgng_freebsd/gencode-remote
@@ -31,13 +31,8 @@ else
    name="$__object_id"
 fi
 
-if [ -f "$__object/parameter/flavor" ]; then
-   flavor="$(cat "$__object/parameter/flavor")"
-fi
-
-if [ -f "$__object/parameter/version" ]; then
-   version="$(cat "$__object/parameter/version")"
-fi
+flavor="$(cat "$__object/parameter/flavor")"
+version="$(cat "$__object/parameter/version")"
 
 if [ -f "$__object/parameter/upgrade" ]; then
    upgrade="true"
@@ -45,15 +40,8 @@ else
    upgrade="false"
 fi
 
-if [ -f "$__object/parameter/repo" ]; then
-   repo="$(cat "$__object/parameter/repo")"
-fi
-
-if [ -f "$__object/parameter/state" ]; then
-   state="$(cat "$__object/parameter/state")"
-else
-   state="present"
-fi
+repo="$(cat "$__object/parameter/repo")"
+state="$(cat "$__object/parameter/state")"
 curr_version="$(cat "$__object/explorer/pkg_version")"
 add_cmd="pkg install -y"
 rm_cmd="pkg delete -y"
diff --git a/cdist/conf/type/__package_pkgng_freebsd/parameter/default/flavor b/cdist/conf/type/__package_pkgng_freebsd/parameter/default/flavor
new file mode 100644
index 00000000..e69de29b
diff --git a/cdist/conf/type/__package_pkgng_freebsd/parameter/default/repo b/cdist/conf/type/__package_pkgng_freebsd/parameter/default/repo
new file mode 100644
index 00000000..e69de29b
diff --git a/cdist/conf/type/__package_pkgng_freebsd/parameter/default/state b/cdist/conf/type/__package_pkgng_freebsd/parameter/default/state
new file mode 100644
index 00000000..e7f6134f
--- /dev/null
+++ b/cdist/conf/type/__package_pkgng_freebsd/parameter/default/state
@@ -0,0 +1 @@
+present
diff --git a/cdist/conf/type/__package_pkgng_freebsd/parameter/default/version b/cdist/conf/type/__package_pkgng_freebsd/parameter/default/version
new file mode 100644
index 00000000..e69de29b