From 9a161c87bf82cd6a90287d3f2ab9e032d9f391f1 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 9 Nov 2015 16:22:34 +0000 Subject: [PATCH] Make sure wget is installed --- ChangeLog | 4 ++++ bootstrap-salt.sh | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index af9a9bc1b..ff7ccb160 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Version 2015.11.09 + * Make sure that wget is installed. #868 + + Version 2015.11.04: * Allow bypassing dependencies installation. Thanks EYJ. #656. * Add FreeBSD 11 support. Thanks Chris Buechler(cbuechler). #653 diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index cb6d88bab..28dee1509 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -17,7 +17,7 @@ # CREATED: 10/15/2012 09:49:37 PM WEST #====================================================================================================================== set -o nounset # Treat unset variables as an error -__ScriptVersion="2015.11.04" +__ScriptVersion="2015.11.09" __ScriptName="bootstrap-salt.sh" #====================================================================================================================== @@ -1881,6 +1881,10 @@ install_ubuntu_stable_deps() { /etc/apt/sources.list.d/saltstack.list fi + + # Make sure wget is available + __apt_get_install_noinput wget + # shellcheck disable=SC2086 wget $_WGET_ARGS -q http://repo.saltstack.com/apt/ubuntu/ubuntu$DISTRO_MAJOR_VERSION/$STABLE_REV/SALTSTACK-GPG-KEY.pub -O - | apt-key add - || return 1