[travis] more upload script fixes

.travis.yml

@@ -54,7 +54,7 @@ script:
     - ~/dune/bin/dunecontrol ${DCONTROL_ARG} --only=${MY_MODULE} bexec make
     - ~/dune/bin/dunecontrol ${DCONTROL_ARG} --only=${MY_MODULE} bexec make test_binaries
     - ~/dune/bin/dunecontrol ${DCONTROL_ARG} --only=${MY_MODULE} bexec make test
-    - ${TRAVIS_BUILD_DIR}/scripts/upload_test_logs.bash ${DUNE_BUILD_DIR}/dune-stuff/
+    - ${TRAVIS_BUILD_DIR}/scripts/upload_test_logs.bash
     - ~/dune/bin/dunecontrol ${DCONTROL_ARG} --only=${MY_MODULE} bexec make headercheck -k
     - ~/dune/bin/dunecontrol ${DCONTROL_ARG} --only=${MY_MODULE} bexec make install | grep -v "Installing"
     - ~/dune/bin/dunecontrol ${DCONTROL_ARG} --only=${MY_MODULE} bexec make package_source
@@ -85,7 +85,7 @@ cache:
 env:
   global:
     - MY_MODULE=dune-stuff DUNE_BUILD_DIR=${HOME}/dune_build/ INSTALL_DIR=$HOME/dune
-    - secure: "iuWrq6nisl/ssnp8JadXWJLwdr2GDu+b0BMvTWALRjbXJWxZEEaKCnK+sGgAVqdsdvntWo9jmoGQ5O5z2KNXpAGcgLfDfG1sTS2/JYkaoRKqv/rBuqOWkmpSHzQvGCfQMC637+YHhILEzlcR9MSlbvZg00WYNQgYwOssCcRfmIY="
+    - secure: "LTY7Jr3Wyb6/4f0/Wo43CXRJ5u9H+Amb2x8Krq0JKVGUzabJKGTNgc5qbfupcAJPv0E24mqfua7meuDKiDBtFA0u20P+gHzEFzM81Fs4GSKhjLWit7Vj7END99a2McV9nxtT02hdummCsFKFXKc/fAYWSuj4Jb050bdjxhJKUh4="
 
 matrix:
   include:

scripts/upload_test_logs.bash

 #! /bin/bash
-set -u
-set -x
 
-BRANCH=${TRAVIS_BRANCH}
-if [ "x${TRAVIS_PULL_REQUEST}" -ne "xfalse" ] ; then
-    BRANCH=PR_${TRAVIS_PULL_REQUEST}_to_${TRAVIS_BRANCH}
+BRANCH=PR_${TRAVIS_PULL_REQUEST}_to_${TRAVIS_BRANCH}
+if [ "x${TRAVIS_PULL_REQUEST}" == "xfalse" ] ; then
+    BRANCH=${TRAVIS_BRANCH}
 fi
 cd
 rm -rf logs
@@ -13,7 +11,8 @@ cd logs
 git checkout ${BRANCH}
 DIR=${CXX_COMPILER}__wo_${MODULES_TO_DELETE// /_}
 rm -rf ${DIR}
-rsync -a ${DUNE_BUILD_DIR}/dune/stuff/test/*xml ${DIR}
+mkdir ${DIR}
+rsync -a ${DUNE_BUILD_DIR}/dune-stuff/dune/stuff/test/*xml ${DIR}
 printenv | sort > ${DIR}/env
 git add .
 git config user.name "Travis-CI"