From 10856f2ded85f7747817f892d460d6b032fe62de Mon Sep 17 00:00:00 2001
From: Alex Xu <alex_y_xu@yahoo.ca>
Date: Thu, 20 Feb 2014 09:55:09 -0500
Subject: asdf

---
 .travis.sh | 2 ++
 setup.sh   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/.travis.sh b/.travis.sh
index 4c3a777..4b1926b 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -4,6 +4,8 @@ set -e -x
 
 case "$1" in
   before_install)
+    sudo service postgresql stop
+    sudo service mysql stop
     sudo apt-get update -q
 
     curl http://nodejs.org/dist/node-latest.tar.gz | tar -xz
diff --git a/setup.sh b/setup.sh
index 2628341..39b4e08 100755
--- a/setup.sh
+++ b/setup.sh
@@ -2,6 +2,8 @@
 
 if [ -z $MAKEOPTS ]; then
   MAKEOPTS="-j`nproc`"
+  echo "No MAKEOPTS specified, setting $MAKEOPTS automatically."
+  printf "%siB free, approx 1GiB/core required (depending on ffmpeg settings)." "$(free -ht | tail -n 1 | awk '{print $4}')"
 fi
 
 set -e -x
-- 
cgit v1.2.3-70-g09d2