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

Renamed __apt_get_noinput to __apt_get_install_noinput.

Browse source
This commit is contained in:
Pedro Algarvio 2013-09-25 17:32:59 +01:00
parent 46832eb26c
commit fac777d024
1 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
bootstrap-salt.sh
View file

@ -946,14 +946,15 @@ __git_clone_and_checkout() {
#--- FUNCTION ----------------------------------------------------------------
# NAME: __apt_get_noinput
# NAME: __apt_get_install_noinput
# DESCRIPTION: (DRY) apt-get install with noinput options
#-------------------------------------------------------------------------------
__apt_get_noinput() {
__apt_get_install_noinput() {
apt-get install -y -o DPkg::Options::=--force-confold $@; return $?
}
#--- FUNCTION ----------------------------------------------------------------
# NAME: copyfile
# DESCRIPTION: Simple function to copy files. Overrides if asked.
@ -1111,9 +1112,9 @@ install_ubuntu_deps() {
apt-get update
if [ $DISTRO_MAJOR_VERSION -eq 12 ] && [ $DISTRO_MINOR_VERSION -gt 04 ] || [ $DISTRO_MAJOR_VERSION -gt 12 ]; then
# Above Ubuntu 12.04 add-apt-repository is in a different package
__apt_get_noinput software-properties-common || return 1
__apt_get_install_noinput software-properties-common || return 1
else
__apt_get_noinput python-software-properties || return 1
__apt_get_install_noinput python-software-properties || return 1
fi
if [ "x$(grep -R universe /etc/apt/sources.list /etc/apt/sources.list.d/ | grep -v '#')" != "x" ]; then
@ -1144,9 +1145,9 @@ install_ubuntu_daily_deps() {
install_ubuntu_deps
if [ $DISTRO_MAJOR_VERSION -eq 12 ] && [ $DISTRO_MINOR_VERSION -gt 04 ] || [ $DISTRO_MAJOR_VERSION -gt 12 ]; then
# Above Ubuntu 12.04 add-apt-repository is in a different package
__apt_get_noinput software-properties-common || return 1
__apt_get_install_noinput software-properties-common || return 1
else
__apt_get_noinput python-software-properties || return 1
__apt_get_install_noinput python-software-properties || return 1
fi
if [ $DISTRO_MAJOR_VERSION -lt 11 ] && [ $DISTRO_MINOR_VERSION -lt 10 ]; then
add-apt-repository ppa:saltstack/salt-daily || return 1
@ -1165,7 +1166,7 @@ install_ubuntu_daily_deps() {
install_ubuntu_11_10_deps() {
apt-get update
__apt_get_noinput python-software-properties || return 1
__apt_get_install_noinput python-software-properties || return 1
add-apt-repository -y 'deb http://us.archive.ubuntu.com/ubuntu/ oneiric universe' || return 1
add-apt-repository -y ppa:saltstack/salt || return 1
@ -1180,7 +1181,7 @@ install_ubuntu_11_10_deps() {
install_ubuntu_git_deps() {
install_ubuntu_deps || return 1
__apt_get_noinput git-core python-yaml python-m2crypto python-crypto \
__apt_get_install_noinput git-core python-yaml python-m2crypto python-crypto \
msgpack-python python-zmq python-jinja2 || return 1
__git_clone_and_checkout || return 1
@ -1210,7 +1211,7 @@ install_ubuntu_stable() {
if [ $_INSTALL_SYNDIC -eq $BS_TRUE ]; then
packages="${packages} salt-syndic"
fi
__apt_get_noinput ${packages} || return 1
__apt_get_install_noinput ${packages} || return 1
return 0
}
@ -1342,9 +1343,9 @@ _eof
apt-get update
# We NEED to install the unstable dpkg or mime-support WILL fail to install
__apt_get_noinput -t unstable dpkg liblzma5 python mime-support || return 1
__apt_get_noinput -t unstable libzmq3 libzmq3-dev || return 1
__apt_get_noinput build-essential python-dev python-pip || return 1
__apt_get_install_noinput -t unstable dpkg liblzma5 python mime-support || return 1
__apt_get_install_noinput -t unstable libzmq3 libzmq3-dev || return 1
__apt_get_install_noinput build-essential python-dev python-pip || return 1
# Saltstack's Unstable Debian repository
if [ "x$(grep -R 'debian.saltstack.com' /etc/apt)" = "x" ]; then
@ -1371,7 +1372,7 @@ _eof
apt-get upgrade -y -o DPkg::Options::=--force-confold || return 1
fi
__apt_get_noinput python-zmq || return 1
__apt_get_install_noinput python-zmq || return 1
return 0
}
@ -1412,11 +1413,11 @@ _eof
fi
apt-get update
__apt_get_noinput -t unstable libzmq3 libzmq3-dev || return 1
__apt_get_noinput build-essential python-dev python-pip || return 1
__apt_get_install_noinput -t unstable libzmq3 libzmq3-dev || return 1
__apt_get_install_noinput build-essential python-dev python-pip || return 1
else
apt-get update || return 1
__apt_get_noinput python-zmq || return 1
__apt_get_install_noinput python-zmq || return 1
fi
if [ $_UPGRADE_SYS -eq $BS_TRUE ]; then
@ -1431,7 +1432,7 @@ install_debian_git_deps() {
export DEBIAN_FRONTEND=noninteractive
apt-get update
__apt_get_noinput lsb-release python python-pkg-resources python-crypto \
__apt_get_install_noinput lsb-release python python-pkg-resources python-crypto \
python-jinja2 python-m2crypto python-yaml msgpack-python python-pip \
git || return 1
@ -1454,7 +1455,7 @@ install_debian_6_git_deps() {
install_debian_6_deps || return 1
if [ $_PIP_ALLOWED -eq $BS_TRUE ]; then
easy_install -U Jinja2 || return 1
__apt_get_noinput lsb-release python python-pkg-resources python-crypto \
__apt_get_install_noinput lsb-release python python-pkg-resources python-crypto \
python-m2crypto python-yaml msgpack-python python-pip git || return 1
__git_clone_and_checkout || return 1
@ -1492,7 +1493,7 @@ __install_debian_stable() {
if [ $_INSTALL_SYNDIC -eq $BS_TRUE ]; then
packages="${packages} salt-syndic"
fi
__apt_get_noinput ${packages} || return 1
__apt_get_install_noinput ${packages} || return 1
if [ $_PIP_ALLOWED -eq $BS_TRUE ]; then
# Building pyzmq from source to build it against libzmq3.