mark/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

+cleanups++

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-03-31 20:21:08 +02:00
commit 5359ed863c
3 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/cdist-object-manifest-run
View file

@ -46,12 +46,12 @@ if [ -f "$__cdist_manifest" ]; then
export __cdist_manifest export __cdist_manifest
echo "Executing manifest ${__cdist_manifest} ..." echo "Executing manifest ${__cdist_manifest} ..."
# Make variables available to non-core - FIXME: beatify
export $__cdist_name_var_object="$__cdist_cur_object_dir" export $__cdist_name_var_object="$__cdist_cur_object_dir"
export $__cdist_name_var_object_id="$__cdist_object_id" export $__cdist_name_var_object_id="$__cdist_object_id"
export $__cdist_name_var_type="$(__cdist_type_dir "$__cdist_type")" export $__cdist_name_var_type="$(__cdist_type_dir "$__cdist_type")"
cdist-manifest-run "$__cdist_target_host" "$__cdist_manifest" cdist-manifest-run "$__cdist_target_host" "$__cdist_manifest"
# Tell cdist-object-run-all that there may be new objects # Tell cdist-object-run-all that there may be new objects
touch "$__cdist_objects_created" touch "$__cdist_objects_created"
else else

2
bin/cdist-object-process
View file

@ -31,7 +31,7 @@ set -eu
__cdist_target_host="$1"; shift __cdist_target_host="$1"; shift
__cdist_object="$1"; shift __cdist_object="$1"; shift
__cdist_object_dir="$(__cdist_object_dir "$__cdist_object")" __cdist_object_dir="$(__cdist_object_dir "$__cdist_object")"
[ -d "$__cdist_object_dir" ] || __cdist_exit_err "Requested object is not defined: $__cdist_object" [ -d "$__cdist_object_dir" ] || __cdist_exit_err "Object undefined: $__cdist_object"
# Export to non-core for use in manifest and gencode scripts # Export to non-core for use in manifest and gencode scripts
export $__cdist_name_var_self=$__cdist_object export $__cdist_name_var_self=$__cdist_object

1
doc/dev/todo/TAKEME
View file

@ -16,6 +16,7 @@ CORE
- cdist-object-gencode: remove code if output empty? - cdist-object-gencode: remove code if output empty?
- also take care of that in cdist-code-run! - also take care of that in cdist-code-run!
- cdist-object-process -> cdist-object-prepare
TYPES TYPES
------ ------