From 6d10e4f0ccdf56b10b40498815e7c9dd89d4a59c Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Wed, 12 Feb 2020 21:14:12 +0100 Subject: [PATCH 1/2] Fix resultsFile Python2 download --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index e8c22483..3f9b7b99 100755 --- a/configure +++ b/configure @@ -27,7 +27,7 @@ IRPF90_URL="https://gitlab.com/scemama/irpf90/-/archive/v1.7.6/irpf90-v1.7.6.tar LIBCAP_URL="https://git.kernel.org/pub/scm/linux/kernel/git/morgan/libcap.git/snapshot/libcap-2.25.tar.gz" NINJA_URL="https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip" OCAML_URL="https://raw.githubusercontent.com/ocaml/opam/master/shell/install.sh" -RESULTS_URL="https://gitlab.com/scemama/resultsFile/-/archive/master/resultsFile-master.tar.gz" +RESULTS_URL="https://gitlab.com/scemama/resultsFile/-/archive/v1.0/resultsFile-v1.0.tar.gz" ZEROMQ_URL="https://github.com/zeromq/libzmq/releases/download/v4.2.5/zeromq-4.2.5.tar.gz" ZLIB_URL="https://www.zlib.net/zlib-1.2.11.tar.gz" From 978c0e5b3caf273d2c498d947ea55e0bacece28a Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Wed, 12 Feb 2020 21:42:49 +0100 Subject: [PATCH 2/2] Fixed wrong path --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 3f9b7b99..dc0ca9f7 100755 --- a/configure +++ b/configure @@ -383,8 +383,8 @@ EOF execute << EOF cd "\${QP_ROOT}"/external tar --gunzip --extract --file resultsFile.tar.gz - mv resultsFile-master/resultsFile "\${QP_ROOT}/external/Python/" - rm --recursive --force resultsFile-master resultsFile.tar.gz + mv resultsFile-*/resultsFile "\${QP_ROOT}/external/Python/" + rm --recursive --force resultsFile-* resultsFile.tar.gz EOF elif [[ ${PACKAGE} = bats ]] ; then