fnux/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

add two new wrapper to run code and shellcode

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-08-02 12:15:59 +02:00
commit 39f1c8a242
2 changed files with 40 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
core/__cdist_exec_fail_on_error → core/__cdist_run
View file

@ -18,18 +18,15 @@
# along with cdist. If not, see <http://www.gnu.org/licenses/>. # along with cdist. If not, see <http://www.gnu.org/licenses/>.
# #
# #
# Exit if an error occurs # Exit if an error occurs running something
# #
__cdist_exec_fail_on_error() __cdist_run()
{ {
set +e set +e
sh -e "$@" "$@"
if [ "$?" -ne 0 ]; then if [ "$?" -ne 0 ]; then
__cdist_echo error "$1 exited non-zero" __cdist_echo error "$1 exited non-zero, aborting."
__cdist_echo warn "Faulty code:"
cat "$1"
__cdist_exit_err "Aborting due to non-zero exit code."
fi fi
set -e set -e
} }

36
core/__cdist_run_shell Executable file
View file

@ -0,0 +1,36 @@
#!/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/>.
#
#
# Exit if an error occurs when running a shell script
#
__cdist_run_shell()
{
set +e
sh -e "$@"
if [ "$?" -ne 0 ]; then
__cdist_echo error "$1 exited non-zero, aborting."
# __cdist_echo error "$1 exited non-zero"
# __cdist_echo warn "Faulty code:"
# cat "$1"
# __cdist_exit_err "Aborting due to non-zero exit code."
fi
set -e
}