Merge remote branch 'nico/master'

bin/cdist-config

@@ -158,6 +158,7 @@ __cdist_object_arg()
    cat "${__cdist_object_base_dir}/${object}/${arg}"
 }
 
+# Find objects, remove ./ and /MARKER
 __cdist_object_list()
 {
    local basedir="$1"; shift
@@ -167,7 +168,7 @@ __cdist_object_list()
       cd "${basedir}"
 
       find . -name "$__cdist_name_object_source" |    \
-         sed -e "s;$__cdist_name_object_source\$;;" -e 's;^./;;'
+         sed -e 's;^./;;' -e "s;/$__cdist_name_object_source\$;;"
    )
 
 }

conf/types/__file/manifest

@@ -1,24 +0,0 @@
-#!/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/>.
-#
-#
-
-# Nothing to do, no dependencies on other types
-
-exit 0

doc/dev/logs/2011-02-22

@@ -0,0 +1,7 @@
+Inherit / subshell:
+
+#
+
+Shell parameters that are set by variable assignment (see the set special built-in) or from the System Interfaces volume of IEEE Std 1003.1-2001 environment inherited by the shell when it begins (see the export special built-in)
+
+http://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_12