From 6f7c383fe8574255657bfae2db83dd777b82ad6f Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Thu, 1 Feb 2018 21:25:49 +0100 Subject: [PATCH 1/2] salt: bootstrap-salt.sh: use -s with curl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes it silent (no progress information), which would otherwise result in output like the following (when the output from the bootstrap script is displayed in verbose mode): % Total % Recei ved % Xferd Avera ge Speed Time Time Time Current Dload Upload Total Spent Left Speed 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 244k 100 244k 0 0 458k 0 --:--:-- --:--:-- --:--:-- 458k * INFO: Running version: 2017.12.13 … --- plugins/provisioners/salt/bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/provisioners/salt/bootstrap-salt.sh b/plugins/provisioners/salt/bootstrap-salt.sh index 410acc24c..a8aaffbf3 100755 --- a/plugins/provisioners/salt/bootstrap-salt.sh +++ b/plugins/provisioners/salt/bootstrap-salt.sh @@ -4,7 +4,7 @@ if [ -x /usr/bin/fetch ]; then /usr/bin/fetch -o bootstrap-salt.sh https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh elif [ -x /usr/bin/curl ]; then - /usr/bin/curl -L -O https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh + /usr/bin/curl -s -L -O https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh elif [ -x /usr/bin/wget ]; then /usr/bin/wget -O bootstrap-salt.sh https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh else From ec99b75c53d818b63e833e3e7f6266bacb4f5f2c Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Fri, 2 Feb 2018 00:39:32 +0100 Subject: [PATCH 2/2] squash! salt: bootstrap-salt.sh: use -s with curl Also use --show-error, and long option for --silent. --- plugins/provisioners/salt/bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/provisioners/salt/bootstrap-salt.sh b/plugins/provisioners/salt/bootstrap-salt.sh index a8aaffbf3..a8b5c9471 100755 --- a/plugins/provisioners/salt/bootstrap-salt.sh +++ b/plugins/provisioners/salt/bootstrap-salt.sh @@ -4,7 +4,7 @@ if [ -x /usr/bin/fetch ]; then /usr/bin/fetch -o bootstrap-salt.sh https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh elif [ -x /usr/bin/curl ]; then - /usr/bin/curl -s -L -O https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh + /usr/bin/curl --silent --show-error -L -O https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh elif [ -x /usr/bin/wget ]; then /usr/bin/wget -O bootstrap-salt.sh https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh else