cleanup gencode-remote

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>

conf/type/__directory/explorer/state

@@ -24,7 +24,7 @@
 destination="/$__object_id"
 
 if [ -e "$destination" ]; then
-   echo yes
+   echo present
 else
-   echo no
+   echo absent
 fi

conf/type/__directory/gencode-remote

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# 2011 Nico Schottelius (nico-cdist at schottelius.org)
+# 2011-2012 Nico Schottelius (nico-cdist at schottelius.org)
 #
 # This file is part of cdist.
 #
@@ -20,29 +20,18 @@
 
 destination="/$__object_id"
 state_should="$(cat "$__object/parameter/state")"
+state_is="$(cat "$__object/explorer/state")"
 
-case "$state_should" in
+[ "$state_should" = "$state_is" ] && exit 0
-   present)
-      # Include parent directories?
-      if [ -f "$__object/parameter/parents" ]; then
-         parents="$(cat "$__object/parameter/parents")"
-         if [ yes = "$parents" ]; then
-            mkdiropt="-p"
-         else
-            mkdiropt=""
-         fi
-      fi
 
-      if [ -f "$__object/parameter/recursive" ]; then
+mkdiropt=""
-         if [ yes = "$(cat "$__object/parameter/recursive")" ]; then
+grep yes "$__object/parameter/parents" >/dev/null 2>&1 && mkdiropt="-p"
-            recursive="-R"
+recursive=""
-         fi
+grep yes "$__object/parameter/recursive" >/dev/null 2>&1 && recursive="-R"
-      fi
 
-      # Only create if not already existent
+case "$state_should" in
-      if [ no = "$(cat "$__object/explorer/exists")" ]; then
+    present)
         echo mkdir $mkdiropt \"$destination\"
-      fi
 
         # Mode settings
         if [ -f "$__object/parameter/mode" ]; then
@@ -60,11 +49,7 @@ case "$state_should" in
         fi
     ;;
     absent)
-      # Only delete if it exists
-      if [ yes = "$(cat "$__object/explorer/exists")" ]; then
         echo rm -rf \"$destination\"
-      fi
-
     ;;
     *)
         echo "Unknown state: $state_should" >&2