From d99c5a124aa093a280d45466323b1260f9cdb799 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 19 Jan 2013 10:53:07 +0000 Subject: [PATCH] Don't wait for user input on `install_ubuntu_git_deps()` --- .travis.yml | 2 +- bootstrap-salt-minion.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9b866e6..b7a5b97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ before_install: - (sudo ./bootstrap-salt-minion.sh stable && salt-minion --versions-report && sudo apt-get remove salt-common salt-minion) || exit 1 - (sudo ./bootstrap-salt-minion.sh daily && salt-minion --versions-report && sudo apt-get remove salt-common salt-minion) || exit 1 -script: (sudo ./bootstrap-salt-minion.sh git develop && salt --versions-report) || exit 1 +script: (/bin/echo -e '\nInstalling from GIT' && sudo ./bootstrap-salt-minion.sh git develop && salt --versions-report) || exit 1 notifications: irc: diff --git a/bootstrap-salt-minion.sh b/bootstrap-salt-minion.sh index 1d14593..f6ef790 100755 --- a/bootstrap-salt-minion.sh +++ b/bootstrap-salt-minion.sh @@ -505,7 +505,7 @@ install_ubuntu_daily_deps() { install_ubuntu_git_deps() { apt-get update __apt_get_noinput python-software-properties - add-apt-repository ppa:saltstack/salt + add-apt-repository -y ppa:saltstack/salt apt-get update __apt_get_noinput git-core python-yaml python-m2crypto python-crypto msgpack-python python-zmq python-jinja2