BREAK __cdist_object_source (due to rename to __cdist_name_object_source)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
parent
1609e52873
commit
64d71229f8
1 changed files with 21 additions and 3 deletions
|
@ -36,6 +36,11 @@
|
||||||
: ${__cdist_name_manifest:=manifests}
|
: ${__cdist_name_manifest:=manifests}
|
||||||
: ${__cdist_name_object:=objects}
|
: ${__cdist_name_object:=objects}
|
||||||
: ${__cdist_name_type:=types}
|
: ${__cdist_name_type:=types}
|
||||||
|
: ${__cdist_name_exec:=exec}
|
||||||
|
|
||||||
|
# File that contains source of a specific object creation
|
||||||
|
: ${__cdist_name_object_source=.source}
|
||||||
|
|
||||||
|
|
||||||
# Base
|
# Base
|
||||||
: ${__cdist_config:=/etc/cdist}
|
: ${__cdist_config:=/etc/cdist}
|
||||||
|
@ -80,9 +85,6 @@ __cdist_abs_myname="$__cdist_abs_mydir/$__cdist_myname"
|
||||||
# Used for IDs
|
# Used for IDs
|
||||||
__cdist_sane_regexp='[A-Za-z0-9]*[-A-Za-z0-9_]*'
|
__cdist_sane_regexp='[A-Za-z0-9]*[-A-Za-z0-9_]*'
|
||||||
|
|
||||||
# File that contains source of a specific object creation
|
|
||||||
__cdist_object_source=".source"
|
|
||||||
|
|
||||||
# Mark object finished
|
# Mark object finished
|
||||||
__cdist_object_finished=".done"
|
__cdist_object_finished=".done"
|
||||||
|
|
||||||
|
@ -133,6 +135,22 @@ __cdist_object_arg()
|
||||||
cat "${__cdist_object_base_dir}/${object}/${arg}"
|
cat "${__cdist_object_base_dir}/${object}/${arg}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
__cdist_object_list()
|
||||||
|
{
|
||||||
|
local basedir="$1"; shift
|
||||||
|
|
||||||
|
cd "${basedir}"
|
||||||
|
|
||||||
|
find . -name "$__cdist_object_source" | \
|
||||||
|
sed -e "s;$__cdist_object_source\$;;" \
|
||||||
|
-e 's;^./;;' \
|
||||||
|
> "$__cdist_tmp_file"
|
||||||
|
|
||||||
|
|
||||||
|
cat "${__cdist_object_base_dir}/${object}/${arg}"
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
__cdist_tmp_removal()
|
__cdist_tmp_removal()
|
||||||
{
|
{
|
||||||
rm -rf "${__cdist_tmp_dir}"
|
rm -rf "${__cdist_tmp_dir}"
|
||||||
|
|
Loading…
Reference in a new issue