From 54223e9a990f2f7d46f84ef6eef94b23a9e77477 Mon Sep 17 00:00:00 2001
From: Arkshine <hv.contact@gmail.com>
Date: Sun, 19 Apr 2015 20:10:04 +0200
Subject: [PATCH] Use the new Travis-CI Container environment

---
 .travis.yml              | 16 +++++++++++++---
 support/checkout-deps.sh |  4 ++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 73378cfd..8e1bd80b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,21 @@
+addons:
+  apt:
+    packages:
+    - lib32stdc++6
+    - lib32z1-dev
+    - libc6-dev-i386
+    - gcc-multilib
+    - g++-multilib
 language: cpp
+sudo: false
 compiler:
   - clang
 before_script:
-  - sudo apt-get update -qq
-  - sudo apt-get install -y g++-multilib libc6-dev-i386 lib32stdc++6 lib32z1-dev
-  - CHECKOUT_DIR=$PWD && cd .. && $CHECKOUT_DIR/support/checkout-deps.sh --no-mysql && cd $CHECKOUT_DIR
+  - CHECKOUT_DIR=$PWD && cd .. 
+  - chmod a+x $CHECKOUT_DIR/support/checkout-deps.sh 
+  - $CHECKOUT_DIR/support/checkout-deps.sh --no-mysql && cd $CHECKOUT_DIR
 script:
   - mkdir build && cd build
+  - PATH="~/.local/bin:$PATH"
   - python ../configure.py --enable-optimize --no-mysql
   - ambuild
diff --git a/support/checkout-deps.sh b/support/checkout-deps.sh
index 4a4ec326..78177602 100755
--- a/support/checkout-deps.sh
+++ b/support/checkout-deps.sh
@@ -91,7 +91,7 @@ if [ $? -eq 1 ]; then
     python setup.py install
   else
     python setup.py build
-    echo "About to install AMBuild - press Ctrl+C to abort, otherwise enter your password for sudo."
-    sudo python setup.py install
+    echo "Installing AMBuild at the user level. Location can be: ~/.local/bin"
+    python setup.py install --user
   fi
 fi