From 4989e9fbeb7cb9f8bf701b73089b59aeae6885e0 Mon Sep 17 00:00:00 2001 From: Daniel Engelke Date: Tue, 17 Oct 2017 17:50:10 +0100 Subject: [PATCH 1/4] Make travis-init executable without chmod --- .travis.yml | 1 - travis/travis-init.sh | 0 2 files changed, 1 deletion(-) mode change 100644 => 100755 travis/travis-init.sh diff --git a/.travis.yml b/.travis.yml index fcf0e80..1cc8d3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,6 @@ node_js: - "6" - "8" before_install: - - chmod +x ./travis/travis-init.sh - ./travis/travis-init.sh - sudo apt-get install -y libyaz5-dev after_success: diff --git a/travis/travis-init.sh b/travis/travis-init.sh old mode 100644 new mode 100755 From ded81532e0e80116586885d79756677f94dbcb32 Mon Sep 17 00:00:00 2001 From: Daniel Engelke Date: Tue, 17 Oct 2017 18:25:06 +0100 Subject: [PATCH 2/4] Utilise a preinstall script to install yaz --- .travis.yml | 3 --- package.json | 1 + preinstall.sh | 30 ++++++++++++++++++++++++++++++ travis/travis-init.sh | 25 ------------------------- 4 files changed, 31 insertions(+), 28 deletions(-) create mode 100755 preinstall.sh delete mode 100755 travis/travis-init.sh diff --git a/.travis.yml b/.travis.yml index 1cc8d3b..72bec3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,5 @@ node_js: - "4" - "6" - "8" -before_install: - - ./travis/travis-init.sh - - sudo apt-get install -y libyaz5-dev after_success: - npm run coveralls \ No newline at end of file diff --git a/package.json b/package.json index e6e65c3..645c634 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "cover": "istanbul cover ./node_modules/mocha/bin/_mocha", "coveralls": "istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage", "install": "node-gyp rebuild", + "preinstall": "./preinstall.sh", "test": "node ./node_modules/mocha/bin/mocha test" }, "repository": { diff --git a/preinstall.sh b/preinstall.sh new file mode 100755 index 0000000..49cec22 --- /dev/null +++ b/preinstall.sh @@ -0,0 +1,30 @@ +#!/bin/sh +# +# init IndexData ubuntu deb repository + +sources_list_d=/etc/apt/sources.list.d +indexdata_list=indexdata.list +apt_key=http://ftp.indexdata.dk/debian/indexdata.asc +deb_url=http://ftp.indexdata.dk + +set -e + +init_apt() { + if [[ "$OSTYPE" == "linux-gnu" ]]; then + file="$sources_list_d/$indexdata_list" + os=ubuntu + + if [ ! -e $file ]; then + codename=$(lsb_release -c -s) + wget -O- $apt_key | sudo apt-key add - + sudo sh -c "echo deb $deb_url/${os} ${codename} main > $file.tmp" + sudo mv -f $file.tmp $file + sudo apt-get update -qq + sudo apt-get install -y libyaz5-dev + fi + elif [[ "$OSTYPE" == "darwin"* ]]; then + brew install yaz + fi +} + +init_apt \ No newline at end of file diff --git a/travis/travis-init.sh b/travis/travis-init.sh deleted file mode 100755 index 09868f2..0000000 --- a/travis/travis-init.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# -# init IndexData ubuntu deb repository - -sources_list_d=/etc/apt/sources.list.d -indexdata_list=indexdata.list -apt_key=http://ftp.indexdata.dk/debian/indexdata.asc -deb_url=http://ftp.indexdata.dk - -set -e - -init_apt() { - file="$sources_list_d/$indexdata_list" - os=ubuntu - - if [ ! -e $file ]; then - codename=$(lsb_release -c -s) - wget -O- $apt_key | sudo apt-key add - - sudo sh -c "echo deb $deb_url/${os} ${codename} main > $file.tmp" - sudo mv -f $file.tmp $file - sudo apt-get update -qq - fi -} - -init_apt \ No newline at end of file From f30d8d2f14b00e92e56e89ad5929f3bbea807f63 Mon Sep 17 00:00:00 2001 From: Daniel Engelke Date: Tue, 17 Oct 2017 18:31:54 +0100 Subject: [PATCH 3/4] Set bash instead of sh --- preinstall.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/preinstall.sh b/preinstall.sh index 49cec22..3461d2a 100755 --- a/preinstall.sh +++ b/preinstall.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # init IndexData ubuntu deb repository From becc5db41578af93b86001cd901ec379f0205b2f Mon Sep 17 00:00:00 2001 From: Daniel Engelke Date: Tue, 17 Oct 2017 22:09:22 +0100 Subject: [PATCH 4/4] Add sudo: required for preinstall script --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 72bec3b..dcb3d0f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +sudo: required language: node_js node_js: - "0.10"