From 1ad762e082275bf5be08c924b72a5dec882d3344 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 18 Oct 2021 16:34:30 +0200 Subject: [PATCH 1/2] Fix to allow the `errexit` option (`bash -e`) --- Scripts/developer_scripts/autotest_cgal_with_ctest | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Scripts/developer_scripts/autotest_cgal_with_ctest b/Scripts/developer_scripts/autotest_cgal_with_ctest index 19144bfb69d..2b135920be9 100755 --- a/Scripts/developer_scripts/autotest_cgal_with_ctest +++ b/Scripts/developer_scripts/autotest_cgal_with_ctest @@ -114,8 +114,7 @@ download_latest() abort_if_latest_already_tested() { if [ -r "RELEASE_NR" ]; then - cmp LATEST RELEASE_NR >> "${ACTUAL_LOGFILE}" - if [ ! ${?} != 0 ]; then + if cmp LATEST RELEASE_NR >> "${ACTUAL_LOGFILE}"; then log "${ACTUAL_LOGFILE}" "This release has already been tested." rm -f "$LOCK_FILE"; exit 1; From 48d4034baacbf4c2d8472c6f53a3d0909cc54443 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 18 Oct 2021 16:35:20 +0200 Subject: [PATCH 2/2] Cosmetic change: I commit what is used on sosno --- Scripts/developer_scripts/autotest_cgal_with_ctest | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Scripts/developer_scripts/autotest_cgal_with_ctest b/Scripts/developer_scripts/autotest_cgal_with_ctest index 2b135920be9..ccf560ac808 100755 --- a/Scripts/developer_scripts/autotest_cgal_with_ctest +++ b/Scripts/developer_scripts/autotest_cgal_with_ctest @@ -97,8 +97,10 @@ download_latest() fi log "${ACTUAL_LOGFILE}" "getting LATEST" if [ -n "${USE_CURL}" ]; then + echo "using curl..." ${CURL} ${CURL_OPTS} "${LATEST_LOCATION}" >> "${ACTUAL_LOGFILE}" 2>&1 else + echo "using wget..." ${WGET} ${WGET_OPTS} "${LATEST_LOCATION}" >> "${ACTUAL_LOGFILE}" 2>&1 fi if [ ! -f "LATEST" ]; then