From 30323456bf302fb75ae6ba294ef27f2c63b4cb78 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@brief.schottelius.org>
Date: Fri, 21 Sep 2012 11:03:53 +0200
Subject: [PATCH] cleanup gencode-remote

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
---
 conf/type/__directory/explorer/state |  4 +-
 conf/type/__directory/gencode-remote | 77 +++++++++++-----------------
 2 files changed, 33 insertions(+), 48 deletions(-)

diff --git a/conf/type/__directory/explorer/state b/conf/type/__directory/explorer/state
index f8b85671..9bdd9024 100755
--- a/conf/type/__directory/explorer/state
+++ b/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
diff --git a/conf/type/__directory/gencode-remote b/conf/type/__directory/gencode-remote
index e871547a..25553183 100755
--- a/conf/type/__directory/gencode-remote
+++ b/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,54 +20,39 @@
 
 destination="/$__object_id"
 state_should="$(cat "$__object/parameter/state")"
+state_is="$(cat "$__object/explorer/state")"
+
+[ "$state_should" = "$state_is" ] && exit 0
+
+mkdiropt=""
+grep yes "$__object/parameter/parents" >/dev/null 2>&1 && mkdiropt="-p"
+recursive=""
+grep yes "$__object/parameter/recursive" >/dev/null 2>&1 && recursive="-R"
 
 case "$state_should" in
-   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
+    present)
+        echo mkdir $mkdiropt \"$destination\"
 
-      if [ -f "$__object/parameter/recursive" ]; then
-         if [ yes = "$(cat "$__object/parameter/recursive")" ]; then
-            recursive="-R"
-         fi
-      fi
+        # Mode settings
+        if [ -f "$__object/parameter/mode" ]; then
+            echo chmod \"$(cat "$__object/parameter/mode")\" \"$destination\"
+        fi
 
-      # Only create if not already existent
-      if [ no = "$(cat "$__object/explorer/exists")" ]; then
-         echo mkdir $mkdiropt \"$destination\"
-      fi
+        # Group
+        if [ -f "$__object/parameter/group" ]; then
+            echo chgrp $recursive \"$(cat "$__object/parameter/group")\" \"$destination\"
+        fi
 
-      # Mode settings
-      if [ -f "$__object/parameter/mode" ]; then
-         echo chmod \"$(cat "$__object/parameter/mode")\" \"$destination\"
-      fi
-
-      # Group
-      if [ -f "$__object/parameter/group" ]; then
-         echo chgrp $recursive \"$(cat "$__object/parameter/group")\" \"$destination\"
-      fi
-
-      # Owner
-      if [ -f "$__object/parameter/owner" ]; then
-         echo chown $recursive \"$(cat "$__object/parameter/owner")\" \"$destination\"
-      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
-      exit 1
-   ;;
+        # Owner
+        if [ -f "$__object/parameter/owner" ]; then
+            echo chown $recursive \"$(cat "$__object/parameter/owner")\" \"$destination\"
+        fi
+    ;;
+    absent)
+        echo rm -rf \"$destination\"
+    ;;
+    *)
+        echo "Unknown state: $state_should" >&2
+        exit 1
+    ;;
 esac