tabulon/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Pull requests Activity

cleanups

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-08-09 17:39:21 +02:00
parent 8daa07acbf
commit 5c35cad477
3 changed files with 30 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
core/__cdist_is_executable
View file

@ -21,25 +21,23 @@
# Exec the code for the given object locally and remote # Exec the code for the given object locally and remote
# #
__cdist_run_if_executable() __cdist_is_executable()
{ {
[ $# -gt 1 ] || __cdist_exit_err "<executable> <command> <args>" [ $# -eq 1 ] || __cdist_exit_err "<executable>"
__cdist_run_if_executable_exec="$1"; shift if [ -e "$1" ]; then
if [ -f "$1" ]; then
if [ -e "$__cdist_run_if_executable_exec" ]; then if [ -x "$1" ]; then
if [ -f "$__cdist_run_if_executable_exec" ]; then # Exists and is a correct executable
if [ -x "$__cdist_run_if_executable_exec" ]; then true
__cdist_echo debug "Running $@ ..."
"$@"
else else
__cdist_exit_err "$__cdist_run_if_executable_exec exists, but is not executable." __cdist_exit_err "$1 exists, but is not executable."
fi fi
else else
__cdist_exit_err "$__cdist_run_if_executable_exec exists, but is not a file." __cdist_exit_err "$1 exists, but is not a file."
fi fi
else
# Does not exist
false
fi fi
# Exit gracefully if nothing is todo
true
} }

75
core/__cdist_object_code_run
View file

@ -24,72 +24,25 @@
__cdist_object_code_run() __cdist_object_code_run()
{ {
[ $# -eq 1 ] || __cdist_exit_err "<object>"
set -x set -x
__cdist_object_code_run_object="$1"; shift
# Code local if [ ! -d "$(__cdist_object_dir "$1")" ]; then
export __cdist_out_object_dir="$__cdist_out_object_dir"
__cdist_code_run "$__cdist_object_code_run_object" "${__cdist_name_gencode_local}"
# Code remote
#__cdist_run_remote "__cdist_code_run" \
# "$__cdist_object_code_run_object" "${__cdist_name_gencode_remote}"
__cdist_run_remote "echo" "__cdist_code_run" \
"$__cdist_object_code_run_object" "${__cdist_name_gencode_remote}; exit 1"
}
#!/bin/sh
#
# 2011 Nico Schottelius (nico-cdist at schottelius.org)
#
# This file is part of cdist.
#
# cdist is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# cdist is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
#
#
# This binary is executed on the remote side to execute code
#
__cdist_code_run()
{
[ $# -eq 2 ] || __cdist_usage "<object> <type>"
__cdist_object_self="$1"; shift
__cdist_code_type="$1"; shift
if [ ! -d "$(__cdist_object_dir "$__cdist_object_self")" ]; then
__cdist_exit_err "Object undefined" __cdist_exit_err "Object undefined"
fi fi
__cdist_code="$(__cdist_object_code "$__cdist_object_self" "${__cdist_code_type}")" # Code local
export __cdist_out_object_dir="$__cdist_out_object_dir"
__cdist_echo info "Checking code-${__cdist_code_type}" if __cdist_is_executable \
"$(__cdist_object_code "$1" "${__cdist_name_gencode_local}")"; then
if [ -e "$__cdist_code" ]; then __cdist_run_shell \
if [ -f "$__cdist_code" ]; then "$(__cdist_object_code "$1" "${__cdist_name_gencode_local}")"
if [ -x "$__cdist_code" ]; then
__cdist_echo info "Executing code-${__cdist_code_type}"
__cdist_run_shell "$__cdist_code"
else
__cdist_exit_err "$__cdist_code exists, but is not executable."
fi
else
__cdist_exit_err "$__cdist_code exists, but is not a file."
fi
fi fi
# Exit gracefully if nothing is todo # Code remote
true if __cdist_is_executable \
"$(__cdist_object_code "$1" "${__cdist_name_gencode_remote}")"; then
fi
} }

9
core/__cdist_run_shell
View file

@ -26,11 +26,10 @@ __cdist_run_shell()
set +e set +e
sh -e "$@" sh -e "$@"
if [ "$?" -ne 0 ]; then if [ "$?" -ne 0 ]; then
__cdist_echo error "$1 exited non-zero, aborting." __cdist_echo error "$1 exited non-zero"
# __cdist_echo error "$1 exited non-zero" __cdist_echo warn "Faulty code:"
# __cdist_echo warn "Faulty code:" cat "$1"
# cat "$1" __cdist_exit_err "Aborting due to non-zero exit code."
# __cdist_exit_err "Aborting due to non-zero exit code."
fi fi
set -e set -e
} }