From 3f94a5c8b505075cdfc51d287b8155a7eac774fd Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 22 Feb 2011 12:49:55 +0100 Subject: [PATCH 1/3] export / subshell solutions Signed-off-by: Nico Schottelius --- doc/dev/logs/2011-02-22 | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/dev/logs/2011-02-22 diff --git a/doc/dev/logs/2011-02-22 b/doc/dev/logs/2011-02-22 new file mode 100644 index 00000000..186b26c4 --- /dev/null +++ b/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 From 78f2431b0302fcaff04a1b8c126ecd4d75f15bf8 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 22 Feb 2011 12:57:35 +0100 Subject: [PATCH 2/3] remove unecessary manifest in __file Signed-off-by: Nico Schottelius --- conf/types/__file/manifest | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100755 conf/types/__file/manifest diff --git a/conf/types/__file/manifest b/conf/types/__file/manifest deleted file mode 100755 index 1e465edc..00000000 --- a/conf/types/__file/manifest +++ /dev/null @@ -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 . -# -# - -# Nothing to do, no dependencies on other types - -exit 0 From 63f702ceaed5f8ab1b5faf2ba4c1ae1d1600ab91 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 22 Feb 2011 13:04:41 +0100 Subject: [PATCH 3/3] remove slash before marker Signed-off-by: Nico Schottelius --- bin/cdist-config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/cdist-config b/bin/cdist-config index 3a57e56e..c4139642 100755 --- a/bin/cdist-config +++ b/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\$;;" ) }