forked from ungleich-public/cdist
fix first bugs in remotely running code
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
parent
9e94bb56a2
commit
00bbadef78
3 changed files with 4 additions and 5 deletions
|
@ -33,7 +33,7 @@ __cdist_echo info "Running global explorers "
|
||||||
__cdist_dir push "${__cdist_explorer_dir}" "${__cdist_remote_explorer_dir}"
|
__cdist_dir push "${__cdist_explorer_dir}" "${__cdist_remote_explorer_dir}"
|
||||||
|
|
||||||
# run the initial explorers remotely
|
# run the initial explorers remotely
|
||||||
__cdist_run_remote "${__cdist_target_host}" cdist-remote-explorer-run \
|
__cdist_run_remote cdist-remote-explorer-run \
|
||||||
"$__cdist_name_var_explorer" "$__cdist_remote_explorer_dir" \
|
"$__cdist_name_var_explorer" "$__cdist_remote_explorer_dir" \
|
||||||
"$__cdist_remote_out_explorer_dir"
|
"$__cdist_remote_out_explorer_dir"
|
||||||
|
|
||||||
|
|
|
@ -32,6 +32,6 @@ __cdist_object_code_run()
|
||||||
__cdist_code_run "$__cdist_object_code_run_object" "${__cdist_name_gencode_local}"
|
__cdist_code_run "$__cdist_object_code_run_object" "${__cdist_name_gencode_local}"
|
||||||
|
|
||||||
# Code remote
|
# Code remote
|
||||||
__cdist_run_remote "$__cdist_target_host" \
|
__cdist_run_remote "__cdist_code_run" \
|
||||||
"__cdist_code_run" "$__cdist_object_code_run_object" "${__cdist_name_gencode_remote}"
|
"$__cdist_object_code_run_object" "${__cdist_name_gencode_remote}"
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,6 +28,5 @@ __cdist_run_remote()
|
||||||
ssh "${__cdist_remote_user}@${__cdist_target_host}" \
|
ssh "${__cdist_remote_user}@${__cdist_target_host}" \
|
||||||
"export PATH=\"${__cdist_remote_bin_dir}:\$PATH\";" \
|
"export PATH=\"${__cdist_remote_bin_dir}:\$PATH\";" \
|
||||||
"export __cdist_out_object_dir=\"$__cdist_remote_out_object_dir\";" \
|
"export __cdist_out_object_dir=\"$__cdist_remote_out_object_dir\";" \
|
||||||
". cdist-config;" \
|
"cdist-remote" "$@"
|
||||||
"$@"
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue