forked from ungleich-public/cdist
make first real use of new __cdist_echo with __cdist_object_self setup
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
parent
caed694dee
commit
a08bd18f4e
|
@ -27,20 +27,19 @@
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
__cdist_target_host="$1"; shift
|
__cdist_target_host="$1"; shift
|
||||||
__cdist_object="$1"; shift
|
__cdist_object_self="$1"; shift
|
||||||
|
|
||||||
__cdist_code_local="$(__cdist_object_code "$__cdist_object")-${__cdist_name_gencode_local}"
|
__cdist_code_local="$(__cdist_object_code "$__cdist_object_self")-${__cdist_name_gencode_local}"
|
||||||
__cdist_code_remote="$(__cdist_object_code "$__cdist_object")-${__cdist_name_gencode_remote}"
|
__cdist_code_remote="$(__cdist_object_code "$__cdist_object_self")-${__cdist_name_gencode_remote}"
|
||||||
|
|
||||||
# FIXME: check that no file is created if there is no gencode
|
# FIXME: check that no file is created if there is no gencode
|
||||||
# probably move output code to cdist-object-gencode
|
# probably move output code to cdist-object-gencode
|
||||||
|
__cdist_echo info "Generating local code ..."
|
||||||
__cdist_echo info "Generating local code for $__cdist_object ..."
|
cdist-object-gencode "$__cdist_target_host" "$__cdist_object_self" \
|
||||||
cdist-object-gencode "$__cdist_target_host" "$__cdist_object" \
|
|
||||||
"${__cdist_name_gencode_local}" > "${__cdist_code_local}"
|
"${__cdist_name_gencode_local}" > "${__cdist_code_local}"
|
||||||
|
|
||||||
__cdist_echo info "Generating remote code for $__cdist_object ..."
|
__cdist_echo info "Generating remote code ..."
|
||||||
cdist-object-gencode "$__cdist_target_host" "$__cdist_object" \
|
cdist-object-gencode "$__cdist_target_host" "$__cdist_object_self" \
|
||||||
"${__cdist_name_gencode_remote}" > "${__cdist_code_remote}"
|
"${__cdist_name_gencode_remote}" > "${__cdist_code_remote}"
|
||||||
|
|
||||||
chmod u+x "${__cdist_code_local}" "${__cdist_code_remote}"
|
chmod u+x "${__cdist_code_local}" "${__cdist_code_remote}"
|
||||||
|
|
Loading…
Reference in a new issue