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

move gencode type path combination into cdist-config (also for __cdist_type_gencode)

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-04-28 14:46:35 +02:00
parent 99bf12a48f
commit 93ef73a645
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/cdist-config
View file

@ -397,7 +397,7 @@ __cdist_type_explorer_pushed_add()
__cdist_type_gencode()
{
echo "${__cdist_type_dir}/$1/${__cdist_name_gencode}"
echo "${__cdist_type_dir}/$1/${__cdist_name_gencode}-$2"
}
__cdist_type_manifest()

6
bin/cdist-object-gencode
View file

@ -33,10 +33,8 @@ __cdist_gencode_type="$1"; shift
__cdist_object_dir="$(__cdist_object_dir "$__cdist_object_self")"
__cdist_type="$(__cdist_type_from_object "$__cdist_object_self")"
__cdist_object_id="$(__cdist_object_id_from_object "$__cdist_object_self")"
__cdist_code_output="$(__cdist_object_code "$__cdist_object_self" "${__cdist_gencode_type}")"
# Full path to where the executable of the type should exist, if the type has one
gencode="$(__cdist_type_gencode "$__cdist_type")-${__cdist_gencode_type}"
__cdist_code_output="$(__cdist_object_code "$__cdist_object_self" "$__cdist_gencode_type")"
gencode="$(__cdist_type_gencode "$__cdist_type" "$__cdist_gencode_type")"
# export variables for gencode
export __object_id="$__cdist_object_id"