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

Merge pull request #1413 from cedwards/develop

Browse source 
Use package "origin" for all FreeBSD packages
This commit is contained in:
Pedro Algarvio 2020-01-29 14:14:45 +00:00 • committed by GitHub
commit fa1f1e9d40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.rst
View file

@ -329,7 +329,7 @@ UNIX systems
**BSD**:
- OpenBSD (``pip`` installation)
- FreeBSD 9/10/11
- FreeBSD 9/10/11/12
**SunOS**:

16
bootstrap-salt.sh
View file

@ -5296,18 +5296,18 @@ install_freebsd_deps() {
}
install_freebsd_git_deps() {
install_freebsd_stable_deps || return 1
install_freebsd_deps || return 1
SALT_DEPENDENCIES=$(/usr/local/sbin/pkg search -R -d py36-salt | grep 'origin:' \
| tail -n +2 | awk -F\" '{print $2}' | sed 's#.*/py-#py36-#g')
SALT_DEPENDENCIES=$(/usr/local/sbin/pkg search -R -d py37-salt | grep 'origin:' \
| tail -n +2 | awk -F\" '{print $2}')
# shellcheck disable=SC2086
/usr/local/sbin/pkg install -y ${SALT_DEPENDENCIES} || return 1
/usr/local/sbin/pkg install -y ${SALT_DEPENDENCIES} python || return 1
if ! __check_command_exists git; then
/usr/local/sbin/pkg install -y git || return 1
fi
/usr/local/sbin/pkg install -y py36-requests || return 1
/usr/local/sbin/pkg install -y py37-requests || return 1
__git_clone_and_checkout || return 1
@ -5354,15 +5354,15 @@ install_freebsd_stable() {
# installing latest version of salt from FreeBSD CURRENT ports repo
#
# shellcheck disable=SC2086
/usr/local/sbin/pkg install -y py36-salt || return 1
/usr/local/sbin/pkg install -y py37-salt || return 1
return 0
}
install_freebsd_git() {
# /usr/local/bin/python2 in FreeBSD is a symlink to /usr/local/bin/python2.7
__PYTHON_PATH=$(readlink -f "$(command -v python2)")
# /usr/local/bin/python3 in FreeBSD is a symlink to /usr/local/bin/python3.7
__PYTHON_PATH=$(readlink -f "$(command -v python3)")
__ESCAPED_PYTHON_PATH=$(echo "${__PYTHON_PATH}" | sed 's/\//\\\//g')
# Install from git