From 3c135ccab2ca20af52e7fd0e7af03fdff828446c Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 25 Oct 2013 00:07:39 +0200
Subject: [ticket/11970] Add set -x to Travis setup scripts.

Output is hidden by Travis by default and this will allow easier debugging.

PHPBB3-11970
---
 travis/setup-mariadb.sh   | 1 +
 travis/setup-webserver.sh | 1 +
 2 files changed, 2 insertions(+)

(limited to 'travis')

diff --git a/travis/setup-mariadb.sh b/travis/setup-mariadb.sh
index d9a88edb24..7e5c4e7d42 100755
--- a/travis/setup-mariadb.sh
+++ b/travis/setup-mariadb.sh
@@ -4,6 +4,7 @@
 # @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 #
 set -e
+set -x
 
 # MariaDB Series
 VERSION='5.5'
diff --git a/travis/setup-webserver.sh b/travis/setup-webserver.sh
index 95fc4ec1f8..4cb2d3ed89 100755
--- a/travis/setup-webserver.sh
+++ b/travis/setup-webserver.sh
@@ -4,6 +4,7 @@
 # @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 #
 set -e
+set -x
 
 sudo apt-get update -qq
 sudo apt-get install -qq nginx realpath
-- 
cgit v1.2.1


From e65483ac3249c87aa147e99ad612b7fb211ce9c5 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 25 Oct 2013 00:33:19 +0200
Subject: [ticket/11970] Make apt-get less quiet.

PHPBB3-11970
---
 travis/setup-mariadb.sh   | 10 +++++-----
 travis/setup-webserver.sh |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'travis')

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
 
-- 
cgit v1.2.1