From 7544ab6034f45eb357517fcc311c443d345e84e8 Mon Sep 17 00:00:00 2001 From: ice0 Date: Aug 15 2018 08:34:20 +0000 Subject: Fixed travis build error --- diff --git a/autobuild/install-requirements-linux.sh b/autobuild/install-requirements-linux.sh index db439bd..a78f2cd 100755 --- a/autobuild/install-requirements-linux.sh +++ b/autobuild/install-requirements-linux.sh @@ -1,5 +1,7 @@ #!/bin/bash +set -e + # Make sure we have all dependencies installed echo "Checking dependencies..." DEB_LIST_MINIMAL="\ @@ -208,7 +210,7 @@ elif which apt-get >/dev/null; then fi echo "Running apt-get (you need root privelegies to do that)..." echo - #sudo apt-get update || true + sudo apt-get update -qq || true sudo apt-get install -y -q $PKG_LIST sudo apt-get install -y -q autopoint || true # Ubuntu special case else diff --git a/autobuild/synfigstudio-linux-build.sh b/autobuild/synfigstudio-linux-build.sh index 59b8839..c8cdc43 100755 --- a/autobuild/synfigstudio-linux-build.sh +++ b/autobuild/synfigstudio-linux-build.sh @@ -509,7 +509,7 @@ cp /usr/local/lib/libboost_program_options.so.1.53.0 $PREFIX/lib/ mkETL() { -travis_fold_start ETL.1 "Building ETL" +travis_fold_start ETL "Building ETL" if [ -f ${SYNFIG_REPO_DIR}/ETL/trunk/configure.ac ]; then pushd ${SYNFIG_REPO_DIR}/ETL/trunk @@ -535,12 +535,12 @@ sed -i "s|^Cflags: -I\\\${includedir}|Cflags: -I$REPO_DIR\/ETL -I\\\${includedir make install popd -travis_fold_end ETL.1 +travis_fold_end ETL } mksynfig() { -travis_fold_start synfigcore.1 "Building Synfig Core" +travis_fold_start SynfigCore "Building Synfig Core" if [ -d ${SYNFIG_REPO_DIR}/synfig-core/trunk/configure.ac ]; then pushd ${SYNFIG_REPO_DIR}/synfig-core/trunk else @@ -588,12 +588,12 @@ sed -i "s|^includedir=.*$|includedir=$SYNFIG_REPO_DIR\/synfig-core\/src|" synfig make install popd -travis_fold_end synfigcore.1 +travis_fold_end SynfigCore } mksynfigstudio() { -travis_fold_start synfigstudio.1 "Building Synfig Studio" +travis_fold_start SynfigStudio "Building Synfig Studio" if [ -d ${SYNFIG_REPO_DIR}/synfig-studio/trunk/configure.ac ]; then pushd ${SYNFIG_REPO_DIR}/synfig-studio/trunk else @@ -627,7 +627,7 @@ done #fi popd -travis_fold_end synfigstudio.1 +travis_fold_end SynfigStudio } mkpack()