saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-17 10:10:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert last bashism. Breaks one liner installs. Refs #25.

Browse source
This commit is contained in:
Pedro Algarvio 2013-01-21 20:01:09 +00:00
parent 8a58c1c236
commit 01d2adfead
1 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
bootstrap-salt-minion.sh
View file

@ -383,12 +383,30 @@ fi
#-------------------------------------------------------------------------------
__function_defined() {
FUNC_NAME=$1
if [ "$(grep $FUNC_NAME $(dirname $0)/$(basename $0))x" != "x" ]; then
# This is really ugly and counter producing but it was, so far, the
# only way we could have a POSIX compliant method to find if a function
# is defined within this script.
echo " * INFO: Found function $FUNC_NAME"
return 0
if [ "${DISTRO_NAME_L}" = "centos" ]; then
if typeset -f $FUNC_NAME &>/dev/null ; then
echo " * INFO: Found function $FUNC_NAME"
return 0
fi
# Try POSIXLY_CORRECT or not
elif test -n "${POSIXLY_CORRECT+yes}"; then
if typeset -f ${FUNC_NAME} >/dev/null 2>&1 ; then
echo " * INFO: Found function $FUNC_NAME"
return 0
fi
else
# Arch linux seems to fall here
if $( type ${FUNC_NAME} >/dev/null 2>&1 ) ; then
echo " * INFO: Found function $FUNC_NAME"
return 0
fi
# if [ "$(grep $FUNC_NAME $(dirname $0)/$(basename $0))x" != "x" ]; then
# # This is really ugly and counter producing but it was, so far, the
# # only way we could have a POSIX compliant method to find if a function
# # is defined within this script.
# echo " * INFO: Found function $FUNC_NAME"
# return 0
fi
echo " * INFO: $FUNC_NAME not found...."
return 1