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

Update .gitignore with more generic pattern for VIM swap files

Browse source
This commit is contained in:
Denys Havrysh 2016-09-01 17:45:15 +03:00
parent caadc0931e
commit ac982819f8
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -1,7 +1,6 @@
/.project /.project
*.swp *.sw?
.vagrant .vagrant
# Pycharm # Pycharm
.idea .idea

8
bootstrap-salt.sh
View file

@ -592,7 +592,7 @@ else
fi fi
# Root permissions are required to run this script # Root permissions are required to run this script
if [ "$(${whoami})" != "root" ]; then if [ "$($whoami)" != "root" ]; then
echoerror "Salt requires root privileges to install. Please re-run this script as root." echoerror "Salt requires root privileges to install. Please re-run this script as root."
exit 1 exit 1
fi fi
@ -612,14 +612,14 @@ if [ "${CALLER}x" = "${0}x" ]; then
fi fi
# Work around for 'Docker + salt-bootstrap failure' https://github.com/saltstack/salt-bootstrap/issues/394 # Work around for 'Docker + salt-bootstrap failure' https://github.com/saltstack/salt-bootstrap/issues/394
if [ ${_DISABLE_SALT_CHECKS} -eq $BS_FALSE ] && [ -f /tmp/disable_salt_checks ]; then if [ "${_DISABLE_SALT_CHECKS}" -eq $BS_FALSE ] && [ -f /tmp/disable_salt_checks ]; then
# shellcheck disable=SC2016 # shellcheck disable=SC2016
echowarn 'Found file: /tmp/disable_salt_checks, setting _DISABLE_SALT_CHECKS=$BS_TRUE' echowarn 'Found file: /tmp/disable_salt_checks, setting _DISABLE_SALT_CHECKS=$BS_TRUE'
_DISABLE_SALT_CHECKS=$BS_TRUE _DISABLE_SALT_CHECKS=$BS_TRUE
fi fi
# Because -a can only be installed into virtualenv # Because -a can only be installed into virtualenv
if ([ $_PIP_ALL -eq $BS_TRUE ] && [ "$_VIRTUALENV_DIR" = "null" ]); then if [ "${_PIP_ALL}" -eq $BS_TRUE ] && [ "${_VIRTUALENV_DIR}" = "null" ]; then
usage usage
# Could possibly set up a default virtualenv location when -a flag is passed # Could possibly set up a default virtualenv location when -a flag is passed
echoerror "Using -a requires -V because pip pkgs should be siloed from python system pkgs" echoerror "Using -a requires -V because pip pkgs should be siloed from python system pkgs"
@ -627,7 +627,7 @@ if ([ $_PIP_ALL -eq $BS_TRUE ] && [ "$_VIRTUALENV_DIR" = "null" ]); then
fi fi
# Make sure virtualenv directory does not already exist # Make sure virtualenv directory does not already exist
if [ -d "$_VIRTUALENV_DIR" ]; then if [ -d "${_VIRTUALENV_DIR}" ]; then
echoerror "The directory ${_VIRTUALENV_DIR} for virtualenv already exists" echoerror "The directory ${_VIRTUALENV_DIR} for virtualenv already exists"
exit 1 exit 1
fi fi