forked from ungleich-public/cdist
use new wrapper __cdist_run_shell
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
parent
39f1c8a242
commit
7fab1c9dd9
3 changed files with 3 additions and 3 deletions
|
@ -40,7 +40,7 @@ __cdist_code_run()
|
||||||
if [ -f "$__cdist_code" ]; then
|
if [ -f "$__cdist_code" ]; then
|
||||||
if [ -x "$__cdist_code" ]; then
|
if [ -x "$__cdist_code" ]; then
|
||||||
__cdist_echo info "Executing code-${__cdist_code_type}"
|
__cdist_echo info "Executing code-${__cdist_code_type}"
|
||||||
__cdist_exec_fail_on_error "$__cdist_code"
|
__cdist_run_shell "$__cdist_code"
|
||||||
else
|
else
|
||||||
__cdist_exit_err "$__cdist_code exists, but is not executable."
|
__cdist_exit_err "$__cdist_code exists, but is not executable."
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -53,5 +53,5 @@ __cdist_manifest_run()
|
||||||
# prepend our path, so all cdist tools come before other tools
|
# prepend our path, so all cdist tools come before other tools
|
||||||
export PATH="${__cdist_out_type_bin_dir}:$PATH"
|
export PATH="${__cdist_out_type_bin_dir}:$PATH"
|
||||||
|
|
||||||
__cdist_exec_fail_on_error "${__cdist_manifest}"
|
__cdist_run_shell "${__cdist_manifest}"
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,7 +43,7 @@ __cdist_object_gencode()
|
||||||
export __global="$__cdist_out_dir"
|
export __global="$__cdist_out_dir"
|
||||||
|
|
||||||
if [ -x "$__cdist_type_gencode" ]; then
|
if [ -x "$__cdist_type_gencode" ]; then
|
||||||
__cdist_exec_fail_on_error "$__cdist_type_gencode" > "$__cdist_tmp_file"
|
__cdist_run_shell "$__cdist_type_gencode" > "$__cdist_tmp_file"
|
||||||
else
|
else
|
||||||
if [ -e "$__cdist_type_gencode" ]; then
|
if [ -e "$__cdist_type_gencode" ]; then
|
||||||
__cdist_exit_err "$__cdist_type_gencode exists, but is not executable"
|
__cdist_exit_err "$__cdist_type_gencode exists, but is not executable"
|
||||||
|
|
Loading…
Reference in a new issue