diff options
author | Andreas Fischer <bantu@phpbb.com> | 2013-10-25 00:33:19 +0200 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2013-10-26 01:39:04 +0200 |
commit | e65483ac3249c87aa147e99ad612b7fb211ce9c5 (patch) | |
tree | 759b365ed19d3c326bc954585ee2cd38e7b02967 /travis | |
parent | 3c135ccab2ca20af52e7fd0e7af03fdff828446c (diff) | |
download | forums-e65483ac3249c87aa147e99ad612b7fb211ce9c5.tar forums-e65483ac3249c87aa147e99ad612b7fb211ce9c5.tar.gz forums-e65483ac3249c87aa147e99ad612b7fb211ce9c5.tar.bz2 forums-e65483ac3249c87aa147e99ad612b7fb211ce9c5.tar.xz forums-e65483ac3249c87aa147e99ad612b7fb211ce9c5.zip |
[ticket/11970] Make apt-get less quiet.
PHPBB3-11970
Diffstat (limited to 'travis')
-rwxr-xr-x | travis/setup-mariadb.sh | 10 | ||||
-rwxr-xr-x | travis/setup-webserver.sh | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/travis/setup-mariadb.sh b/travis/setup-mariadb.sh index 7e5c4e7d42..aceb6af7ee 100755 --- a/travis/setup-mariadb.sh +++ b/travis/setup-mariadb.sh @@ -13,18 +13,18 @@ VERSION='5.5' OS_CODENAME=$(lsb_release --codename --short) # Manually purge MySQL to remove conflicting files (e.g. /etc/mysql/my.cnf) -sudo apt-get purge -qq mysql-common +sudo apt-get purge -y mysql-common if ! which add-apt-repository > /dev/null then - sudo apt-get update -qq - sudo apt-get install -qq python-software-properties + sudo apt-get update + sudo apt-get install -y python-software-properties fi MIRROR_DOMAIN='ftp.osuosl.org' sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xcbcb082a1bb943db sudo add-apt-repository "deb http://$MIRROR_DOMAIN/pub/mariadb/repo/$VERSION/ubuntu $OS_CODENAME main" -sudo apt-get update -qq +sudo apt-get update # Pin repository in order to avoid conflicts with MySQL from distribution # repository. See https://mariadb.com/kb/en/installing-mariadb-deb-files @@ -37,7 +37,7 @@ Pin-Priority: 1000 sudo debconf-set-selections <<< "mariadb-server-$VERSION mysql-server/root_password password rootpasswd" sudo debconf-set-selections <<< "mariadb-server-$VERSION mysql-server/root_password_again password rootpasswd" -sudo apt-get install -qq mariadb-server +sudo apt-get install -y mariadb-server # Set root password to empty string. echo " diff --git a/travis/setup-webserver.sh b/travis/setup-webserver.sh index 4cb2d3ed89..f1bf69c575 100755 --- a/travis/setup-webserver.sh +++ b/travis/setup-webserver.sh @@ -6,8 +6,8 @@ set -e set -x -sudo apt-get update -qq -sudo apt-get install -qq nginx realpath +sudo apt-get update +sudo apt-get install -y nginx realpath sudo service nginx stop |