summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-x.travis.sh2
-rwxr-xr-xsetup.sh2
2 files changed, 4 insertions, 0 deletions
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