summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/windows/after_success.sh2
-rw-r--r--scripts/windows/before_install.sh3
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/