Merge pull request #381 from acatton/cleanup-default-parameters

Types default values handeling cleanup

cdist/conf/type/__apt_source/manifest

@@ -27,11 +27,9 @@ if [ -f "$__object/parameter/distribution" ]; then
 else
    distribution="$(cat "$__global/explorer/lsb_codename")"
 fi
-if [ -f "$__object/parameter/component" ]; then
+
-   component="$(cat "$__object/parameter/component")"
+component="$(cat "$__object/parameter/component")"
-else
+
-   component=""
-fi
 if [ -f "$__object/parameter/arch" ]; then
    forcedarch="[arch=$(cat "$__object/parameter/arch")]"
 else

cdist/conf/type/__cdistmarker/gencode-remote

@@ -19,19 +19,11 @@
 #
 
 # The marker file is established in the docs, but it isn't obligatory.
-if [ -f "$__object/parameter/destination" ]; then
+destination="$(cat "$__object/parameter/destination")"
-    destination="$(cat "$__object/parameter/destination")"
-else
-    destination='/etc/cdist-configured'
-fi
 
 # The basic output of date is usually good enough, but variety is the
 #   spice of life...
-if [ -f "$__object/parameter/format" ]; then
+format="$(cat "$__object/parameter/format")"
-    format="$(cat "$__object/parameter/format")"
-else
-    format='-u'
-fi
 
 # Dump the timestamp in UTC to the marker
 echo "date $format > $destination"

cdist/conf/type/__cdistmarker/parameter/default/destination

@@ -0,0 +1 @@
+/etc/cdist-configured

cdist/conf/type/__cdistmarker/parameter/default/format

@@ -0,0 +1 @@
+-u

cdist/conf/type/__mysql_database/gencode-remote

@@ -45,7 +45,6 @@ if [ -f "$__object/parameter/user" ]; then
 EOF
 EOFF
    else
-      password=""
       cat <<-EOFF
       mysql -u root <<-EOF
       	GRANT ALL PRIVILEGES ON $database.* to '$user'@'localhost';

cdist/conf/type/__package_apt/gencode-remote

@@ -27,11 +27,7 @@ else
    name="$__object_id"
 fi
 
-if [ -f "$__object/parameter/state" ]; then
+state_should="$(cat "$__object/parameter/state")"
-   state_should="$(cat "$__object/parameter/state")"
-else
-   state_should="present"
-fi
 
 if [ -f "$__object/parameter/target-release" ]; then
    target_release="--target-release $(cat "$__object/parameter/target-release")"

cdist/conf/type/__package_apt/parameter/default/state

@@ -0,0 +1 @@
+present

cdist/conf/type/__package_luarocks/gencode-remote

@@ -29,11 +29,7 @@ else
     name="$__object_id"
 fi
 
-if [ -f "$__object/parameter/state" ]; then
+state_should="$(cat "$__object/parameter/state")"
-   state_should="$(cat "$__object/parameter/state")"
-else
-   state_should="present"
-fi
 
 if grep -q "(installed)" "$__object/explorer/pkg_status"; then
     state_is="present"

cdist/conf/type/__package_luarocks/parameter/default/state

@@ -0,0 +1 @@
+present

cdist/conf/type/__package_opkg/gencode-remote

@@ -28,11 +28,7 @@ else
    name="$__object_id"
 fi
 
-if [ -f "$__object/parameter/state" ]; then
+state_should="$(cat "$__object/parameter/state")"
-   state_should="$(cat "$__object/parameter/state")"
-else
-   state_should="present"
-fi
 
 state_is="$(cat "$__object/explorer/pkg_status")"
 case "$state_is" in

cdist/conf/type/__package_opkg/parameter/default/state

@@ -0,0 +1 @@
+present

cdist/conf/type/__package_pacman/gencode-remote

@@ -31,11 +31,7 @@ else
    name="$__object_id"
 fi
 
-if [ -f "$__object/parameter/state" ]; then
+state_should="$(cat "$__object/parameter/state")"
-   state_should="$(cat "$__object/parameter/state")"
-else
-   state_should="present"
-fi
 
 pkg_version="$(cat "$__object/explorer/pkg_version")"
 if [ -z "$pkg_version" ]; then

cdist/conf/type/__package_pacman/parameter/default/state

@@ -0,0 +1 @@
+present

cdist/conf/type/__package_pip/gencode-remote

@@ -22,11 +22,7 @@
 #
 
 state_is=$(cat "$__object/explorer/state")
-if [ -f "$__object/parameter/state" ]; then
+state_should="$(cat "$__object/parameter/state")"
-   state_should="$(cat "$__object/parameter/state")"
-else
-   state_should="present"
-fi
 
 [ "$state_is" = "$state_should" ] && exit 0
 

cdist/conf/type/__package_pip/parameter/default/state

@@ -0,0 +1 @@
+present

cdist/conf/type/__package_pkg_freebsd/gencode-remote

@@ -51,23 +51,10 @@ else
 	name="$__object_id"
 fi
 
-if [ -f "$__object/parameter/flavor" ]; then
+flavor="$(cat "$__object/parameter/flavor")"
-	flavor="$(cat "$__object/parameter/flavor")"
+version="$(cat "$__object/parameter/version")"
-fi
+pkgsite="$(cat "$__object/parameter/pkgsite")"
-
+state="$(cat "$__object/parameter/state")"
-if [ -f "$__object/parameter/version" ]; then
-	version="$(cat "$__object/parameter/version")"
-fi
-
-if [ -f "$__object/parameter/pkgsite" ]; then
-	pkgsite="$(cat "$__object/parameter/pkgsite")"
-fi
-
-if [ -f "$__object/parameter/state" ]; then
-   state="$(cat "$__object/parameter/state")"
-else
-   state="present"
-fi
 curr_version="$(cat "$__object/explorer/pkg_version")"
 add_cmd="pkg_add"
 rm_cmd="pkg_delete"

cdist/conf/type/__package_pkg_freebsd/parameter/default/state

@@ -0,0 +1 @@
+present

cdist/conf/type/__package_pkg_openbsd/gencode-remote

@@ -42,11 +42,7 @@ else
    name="$__object_id"
 fi
 
-if [ -f "$__object/parameter/state" ]; then
+state_should="$(cat "$__object/parameter/state")"
-   state_should="$(cat "$__object/parameter/state")"
-else
-   state_should="present"
-fi
 
 pkg_version="$(cat "$__object/explorer/pkg_version")"
 

cdist/conf/type/__package_pkg_openbsd/parameter/default/state

@@ -0,0 +1 @@
+present

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")"
-   flavor="$(cat "$__object/parameter/flavor")"
+version="$(cat "$__object/parameter/version")"
-fi
-
-if [ -f "$__object/parameter/version" ]; then
-   version="$(cat "$__object/parameter/version")"
-fi
 
 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")"
-   repo="$(cat "$__object/parameter/repo")"
+state="$(cat "$__object/parameter/state")"
-fi
-
-if [ -f "$__object/parameter/state" ]; then
-   state="$(cat "$__object/parameter/state")"
-else
-   state="present"
-fi
 curr_version="$(cat "$__object/explorer/pkg_version")"
 add_cmd="pkg install -y"
 rm_cmd="pkg delete -y"

cdist/conf/type/__package_pkgng_freebsd/parameter/default/state

@@ -0,0 +1 @@
+present

cdist/conf/type/__package_rubygem/gencode-remote

@@ -27,11 +27,7 @@ else
     name="$__object_id"
 fi
 
-if [ -f "$__object/parameter/state" ]; then
+state_should="$(cat "$__object/parameter/state")"
-   state_should="$(cat "$__object/parameter/state")"
-else
-   state_should="present"
-fi
 
 if grep -q true "$__object/explorer/pkg_status"; then
     state_is="present"

cdist/conf/type/__package_rubygem/parameter/default/state

@@ -0,0 +1 @@
+present