Commit 4a8153848fcd51f3d4c0c3b64d20f63da768d159

Thomas de Grivel 2023-02-15T14:56:20

wip shpkg_ci

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
diff --git a/bin/shpkg_ci b/bin/shpkg_ci
index 714723a..3dfe94a 100755
--- a/bin/shpkg_ci
+++ b/bin/shpkg_ci
@@ -142,8 +142,14 @@ main () {
         verbose 2 shpkg_ci_status "${SHPKG_REPO}.ci.status" ok
         verbose 2 shpkg_ci_status "${SHPKG_REPO}.ci.branch_${SHPKG_REPO_GIT_BRANCH}.status" ok
         verbose 2 shpkg_ci_status "${SHPKG_REPO}.ci.commit_${SHPKG_REPO_HASH}.status" ok
-        if verbose 1 cp -p "${SHPKG_REPO_BUILD_DIR}/var/log/shpkg/tags/${SHPKG_REPO}".*.log "${SHPKG_CI_LOG_DIR}" ||
-           verbose 1 cp -p "${SHPKG_DIR}/var/log/shpkg/tags/${SHPKG_REPO}.ci.log" "${SHPKG_CI_LOG_DIR}"; then
+        SHPKG_CI_COPY=No
+        if verbose 1 cp -p "${SHPKG_REPO_BUILD_DIR}/var/log/shpkg/tags/${SHPKG_REPO}".*.log "${SHPKG_CI_LOG_DIR}"; then
+            SHPKG_CI_COPY=Yes
+        fi
+        if verbose 1 cp -p "${SHPKG_DIR}/var/log/shpkg/tags/${SHPKG_REPO}.ci.log" "${SHPKG_CI_LOG_DIR}"; then
+            SHPKG_CI_COPY=Yes
+        fi
+        if [ "x${SHPKG_CI_COPY}" = "xYes" ]; then
             verbose 2 logs2html
         fi
     done