matthijs/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

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

2
bin/cdist-config
View file

@ -241,7 +241,7 @@ __cdist_host_cache_dir()
__cdist_object_code() __cdist_object_code()
{ {
echo "$(__cdist_object_dir "$1")/${__cdist_name_code}" echo "$(__cdist_object_dir "$1")/${__cdist_name_code}-$2"
} }
__cdist_object_prepared() __cdist_object_prepared()

3
bin/cdist-object-gencode
View file

@ -23,7 +23,7 @@
# #
. cdist-config . cdist-config
[ $# -eq 4 ] || __cdist_usage "<target host>" "<object>" "<type>" "<outfile>" [ $# -eq 3 ] || __cdist_usage "<target host>" "<object>" "<type>"
set -eu set -eu
__cdist_target_host="$1"; shift __cdist_target_host="$1"; shift
@ -33,6 +33,7 @@ __cdist_gencode_type="$1"; shift
__cdist_object_dir="$(__cdist_object_dir "$__cdist_object_self")" __cdist_object_dir="$(__cdist_object_dir "$__cdist_object_self")"
__cdist_type="$(__cdist_type_from_object "$__cdist_object_self")" __cdist_type="$(__cdist_type_from_object "$__cdist_object_self")"
__cdist_object_id="$(__cdist_object_id_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 # 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}" gencode="$(__cdist_type_gencode "$__cdist_type")-${__cdist_gencode_type}"