From 8d8d7da03638b34cf59efeeb780aff897b99ed43 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Thu, 17 Feb 2011 16:54:14 +0100
Subject: [PATCH] cleanup file and issue type

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 conf/types/__file/gencode   | 8 +++-----
 conf/types/__issue/manifest | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/conf/types/__file/gencode b/conf/types/__file/gencode
index 6fbafbe6..b95e52a5 100755
--- a/conf/types/__file/gencode
+++ b/conf/types/__file/gencode
@@ -23,15 +23,12 @@
 #
 
 . cdist-config
-set -e
 
 pwd -P >&2
 ls >&2
 
 type="$(cat type)"
-mode="$(cat mode)"
-path="$(cat path)"
-
+path="$(cat destination)"
 
 case "$type" in
    directory)
@@ -49,6 +46,7 @@ case "$type" in
 
 esac
 
-if [ "$mode" ]; then
+if [ -f mode ]; then
+   mode="$(cat mode)"
    echo chmod \"$mode\" \"$path\"
 fi
diff --git a/conf/types/__issue/manifest b/conf/types/__issue/manifest
index 735c04c8..5236d447 100755
--- a/conf/types/__issue/manifest
+++ b/conf/types/__issue/manifest
@@ -31,4 +31,4 @@ case "$(cat "$__cdist_out_explorers/os")" in
 esac
 
 # FIXME: replace id with $destination post-1.0
-__file etc-issue --source "$source" --destination "$destination"
+__file etc-issue --source "$source" --destination "$destination" --type file