diff options
| author |  Rolf Eike Beer <eike@sf-mail.de> | 2019-03-13 21:57:18 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-03-16 10:06:26 -0700 |
| commit | 0fb66fc91f1c4240ec8d06eb1d26ab6d882a960d (patch) | |
| tree | 23b12bb7154dad033c523828c88df70f138f4ffe | |
| parent | 41410fe218127b34c7b5e6b597e510d45882350f (diff) | |
| download | subsurface-0fb66fc91f1c4240ec8d06eb1d26ab6d882a960d.tar.gz | |
simplfy scripts
Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
| -rw-r--r-- | scripts/windows/after_success.sh | 2 | ||||
| -rw-r--r-- | scripts/windows/before_install.sh | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/scripts/windows/after_success.sh b/scripts/windows/after_success.sh index b84100be7..8be305b3b 100644 --- a/scripts/windows/after_success.sh +++ b/scripts/windows/after_success.sh @@ -1,6 +1,6 @@ #!/bin/bash -if [ ! -z $TRAVIS_BRANCH ] && [ "$TRAVIS_BRANCH" != "master" ] ; then +if [ -n $TRAVIS_BRANCH ] && [ "$TRAVIS_BRANCH" != "master" ] ; then export UPLOADTOOL_SUFFIX=$TRAVIS_BRANCH fi diff --git a/scripts/windows/before_install.sh b/scripts/windows/before_install.sh index 3383f0dec..092488a50 100644 --- a/scripts/windows/before_install.sh +++ b/scripts/windows/before_install.sh @@ -13,8 +13,7 @@ pushd ${TRAVIS_BUILD_DIR}/.. echo "Downloading prebuilt MXE environment from Subsurface-divelog.org" wget -q http://subsurface-divelog.org/downloads/mxe-994ad473.tar.xz mkdir -p mxe -cd mxe -tar xJf ../mxe-994ad473.tar.xz +tar xJ -C mxe -f mxe-994ad473.tar.xz # hack around path dependency - needs to be fixed sudo mkdir -p /data/winqt551/ |