From 50308f2db248dd90230cecce52913e123fc43054 Mon Sep 17 00:00:00 2001 From: Jarrod Millman Date: Fri, 3 Aug 2018 16:24:09 -0500 Subject: [PATCH] Fix xdg-open issue --- .travis.yml | 2 +- tools/travis/linux_install.sh | 11 ++++++++++- tools/travis/script.sh | 4 ++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 90125c2d4fb..5d3a276072f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,7 +69,7 @@ matrix: - libgdal-dev - graphviz - os: osx - osx_image: xcode9.3 + osx_image: xcode8.3 language: generic env: - TRAVIS_PYTHON_VERSION=3.6.1 diff --git a/tools/travis/linux_install.sh b/tools/travis/linux_install.sh index 6119e1ab2ea..821a1154767 100755 --- a/tools/travis/linux_install.sh +++ b/tools/travis/linux_install.sh @@ -12,7 +12,16 @@ if [[ "${OPTIONAL_DEPS}" == 1 ]]; then export C_INCLUDE_PATH=/usr/include/gdal # needed for view_graphviz and default_opener - alias xdg-open="file" + DIR=~/.local/bin + export PATH=$DIR:$PATH + mkdir -p $DIR + FILE=$DIR/xdg-open + cat <$FILE +#!/bin/sh + +echo $1 +EOF + chmod +x $FILE fi diff --git a/tools/travis/script.sh b/tools/travis/script.sh index b2f9f06bd88..108ffe892c3 100755 --- a/tools/travis/script.sh +++ b/tools/travis/script.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -ex +set -e section "Script section" @@ -34,4 +34,4 @@ cd $NX_SOURCE section_end "Script section" -set +ex +set +e