mirror of
https://github.com/saltstack/salt-bootstrap.git
synced 2025-04-17 10:10:25 +00:00
Don't check bash'isms for now since we reverted our last change.
This commit is contained in:
parent
01d2adfead
commit
93ccf442a3
2 changed files with 2 additions and 1 deletions
|
@ -2,7 +2,7 @@ before_install:
|
|||
- sudo apt-get update && sudo apt-get install devscripts
|
||||
|
||||
script:
|
||||
- /usr/bin/checkbashisms -pxf bootstrap-salt-minion.sh || exit 1
|
||||
#- /usr/bin/checkbashisms -pxf bootstrap-salt-minion.sh || exit 1
|
||||
- (/bin/echo -e '\nInstalling stable with bash' && sudo /bin/bash bootstrap-salt-minion.sh && salt-minion --versions-report && sudo apt-get remove salt-common salt-minion) || exit 1
|
||||
- (/bin/echo -e '\nInstalling stable with sh' && sudo ./bootstrap-salt-minion.sh && salt-minion --versions-report && sudo apt-get remove salt-common salt-minion) || exit 1
|
||||
- (/bin/echo -e '\nInstalling explicit stable with sh' && sudo ./bootstrap-salt-minion.sh stable && salt-minion --versions-report && sudo apt-get remove salt-common salt-minion) || exit 1
|
||||
|
|
|
@ -383,6 +383,7 @@ fi
|
|||
#-------------------------------------------------------------------------------
|
||||
__function_defined() {
|
||||
FUNC_NAME=$1
|
||||
d=$(declare -f $FUNCNAME)
|
||||
if [ "${DISTRO_NAME_L}" = "centos" ]; then
|
||||
if typeset -f $FUNC_NAME &>/dev/null ; then
|
||||
echo " * INFO: Found function $FUNC_NAME"
|
||||
|
|
Loading…
Add table
Reference in a new issue