From a761a035fe771d5b72d8f9c299eaaf670f762479 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Sat, 19 Mar 2011 23:26:41 +0100
Subject: [PATCH] update __file with gencode-local and gencode-remote

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 conf/type/__file/gencode-local  | 44 +++++++++++++++++++++++++++++++++
 conf/type/__file/gencode-remote | 22 ++---------------
 2 files changed, 46 insertions(+), 20 deletions(-)
 create mode 100755 conf/type/__file/gencode-local

diff --git a/conf/type/__file/gencode-local b/conf/type/__file/gencode-local
new file mode 100755
index 00000000..1168919e
--- /dev/null
+++ b/conf/type/__file/gencode-local
@@ -0,0 +1,44 @@
+#!/bin/sh
+#
+# 2011 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# __file is a very basic type, which will probably be reused quite often
+#
+
+destination="/$__object_id"
+
+if [ -f "$__object/parameter/source" ]; then
+   source="$(cat "$__object/parameter/source")"
+
+   if [ -f "$source" ]; then
+      local_cksum="$(cksum < "$source")"
+      remote_cksum="$(cat "$__object/explorer/cksum")"
+
+      if [ "$local_cksum" != "$remote_cksum" ]; then
+         # FIXME: The username is ugly and hardcoded, replace after 1.0!
+         # Probably a better aproach is to have the user configured
+         # ~/.ssh/config to contain the right username
+         # Probably describe it in cdist-quickstart...
+         echo scp "$source" "root@${__target_host}:${destination}"
+      fi
+   else
+      echo "Source \"$source\" does not exist." >&2
+      exit 1
+   fi
+fi
diff --git a/conf/type/__file/gencode-remote b/conf/type/__file/gencode-remote
index ef8c5501..7c5cf7ce 100755
--- a/conf/type/__file/gencode-remote
+++ b/conf/type/__file/gencode-remote
@@ -23,31 +23,13 @@
 
 destination="/$__object_id"
 
-if [ -f "$__object/parameter/source" ]; then
-   source="$(cat "$__object/parameter/source")"
-
-   if [ -f "$source" ]; then
-      local_cksum="$(cksum < "$source")"
-      remote_cksum="$(cat "$__object/explorer/cksum")"
-
-      if [ "$local_cksum" != "$remote_cksum" ]; then
-         # FIXME: The username is ugly and hardcoded, replace after 1.0!
-         # Probably a better aproach is to have the user configured
-         # ~/.ssh/config to contain the right username
-         # Probably describe it in cdist-quickstart...
-         scp "$source" "root@${__target_host}:${destination}"
-      fi
-   else
-      echo "Source \"$source\" does not exist." >&2
-      exit 1
-   fi
-else
+# No source? Create empty file
+if [ ! -f "$__object/parameter/source" ]; then
    if [ no = "$(cat "$__object/explorer/exists")" ]; then
       echo touch \"$destination\"
    fi
 fi
 
-
 # Mode settings
 if [ -f "$__object/parameter/mode" ]; then
    echo chmod \"$(cat "$__object/parameter/mode")\" \"$destination\"