From 26acf4fd05412ab402161a91ef921072b2f3570c Mon Sep 17 00:00:00 2001 From: baztian Date: Tue, 11 Feb 2014 17:45:21 +0100 Subject: [PATCH] Fix bad substitution error, add jip dependency and make scripts more robust. --- .travis.yml | 1 + ci/before_install.sh | 3 ++- ci/before_install_jython.sh | 3 ++- ci/before_install_nonjython.sh | 3 ++- ci/install.sh | 2 ++ 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a19f043..3ba1048 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,7 @@ before_install: install: - pip install -r requirements.txt + - pi pinstall jip==0.7 - pip install -e . - jip install org.xerial:sqlite-jdbc:3.7.2 - jip install org.hsqldb:hsqldb:1.8.0.10 diff --git a/ci/before_install.sh b/ci/before_install.sh index 87c0cb6..8e544d2 100755 --- a/ci/before_install.sh +++ b/ci/before_install.sh @@ -1,4 +1,5 @@ -#!/bin/sh +#!/bin/bash +set -e sudo apt-get update -qq sudo apt-get install -qq openjdk-7-jdk openjdk-7-jre diff --git a/ci/before_install_jython.sh b/ci/before_install_jython.sh index db7de6a..2b01f3b 100755 --- a/ci/before_install_jython.sh +++ b/ci/before_install_jython.sh @@ -1,4 +1,5 @@ -#!/bin/sh +#!/bin/bash +set -e pip install jip==0.7 jip install org.python:$JYTHON diff --git a/ci/before_install_nonjython.sh b/ci/before_install_nonjython.sh index a43d70d..8c654bd 100755 --- a/ci/before_install_nonjython.sh +++ b/ci/before_install_nonjython.sh @@ -1,4 +1,5 @@ -#!/bin/sh +#!/bin/bash +set -e cat requirements_python.txt >> requirements.txt ln -s $VIRTUAL_ENV ~/myvirtualenv diff --git a/ci/install.sh b/ci/install.sh index aa79b1b..a1a8065 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -1,4 +1,6 @@ #!/bin/sh +set -e + pip install jip==0.7 install="${TRAVIS_BUILD_DIR}/ci/install_${BACKEND}.sh"