tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bash error

Browse Source
This commit is contained in:
Leith Bade
2014-12-12 09:59:27 +11:00
parent 80016cd469
commit 30c80af0d2
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@@ -48,7 +48,6 @@ env:
before_install:
- sudo service mysql stop
- sudo service postgresql stop
- sudo ps aux
- source ./scripts/local_mason.sh
- source ./scripts/travis_helper.sh
- source ./scripts/flags.sh
@@ -57,8 +56,8 @@ before_install:
- if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then export JAVA_HOME="$(pwd)/jdk1.7.0_71"; fi
- export ANDROID_HOME="$(pwd)/android-sdk"
- ./scripts/travis_before_install.sh
- if [[ ${TRAVIS_OS_NAME} == "linux" && ${MASON_PLATFORM} != "android"]]; then export LD_LIBRARY_PATH=`mason prefix mesa 10.3.1`/lib; fi
- if [[ ${TRAVIS_OS_NAME} == "linux" && ${MASON_PLATFORM} != "android"]]; then glxinfo; fi
- if [[ ${TRAVIS_OS_NAME} == "linux" && ${MASON_PLATFORM} != "android" ]]; then export LD_LIBRARY_PATH=`mason prefix mesa 10.3.1`/lib; fi
- if [[ ${TRAVIS_OS_NAME} == "linux" && ${MASON_PLATFORM} != "android" ]]; then glxinfo; fi
install:
- make config.gypi

2
scripts/travis_before_install.sh
View File

@@ -62,6 +62,8 @@ if [[ "${MASON_PLATFORM}" == "android" ]]; then
echo "chmod NDK"
chmod a+x ./android-ndk-r10c-darwin-x86_64.bin
sudo ps aux
echo "unpacking NDK"
$SEVEN_ZIP_PATH x ./android-ndk-r10c-darwin-x86_64.bin > .tmp-ndk-log
rm .tmp-ndk-log