Commit c712808c0bb8c32e92bd11586618d450d2568919

Thomas de Grivel 2023-02-18T02:39:48

wip ci

diff --git a/share/shpkg/shpkg.subr b/share/shpkg/shpkg.subr
index 4fecbb5..d08c4cc 100644
--- a/share/shpkg/shpkg.subr
+++ b/share/shpkg/shpkg.subr
@@ -942,7 +942,8 @@ shpkg_ci_main () {
             ( . "${SHPKG_REPO_BUILD_DIR}/etc/shpkg/profile"
               verbose 2 shpkg_ci_status "${SHPKG_REPO}.upgrade.status" running
               verbose -n 2 shpkg upgrade "${SHPKG_REPO}"
-              if shpkg upgrade "${SHPKG_REPO}"; then
+              if ( . "${SHPKG_REPO_BUILD_DIR}/share/shpkg/shpkg.subr";
+                   shpkg_upgrade "${SHPKG_REPO}"; ); then
                   verbose 2 shpkg_ci_status "${SHPKG_REPO}.upgrade.status" ok
               else
                   exit 1
@@ -956,7 +957,8 @@ shpkg_ci_main () {
         ( . "${SHPKG_REPO_BUILD_DIR}/etc/shpkg/profile"
           verbose 2 shpkg_ci_status "${SHPKG_REPO}.install.status" running
           verbose -n 2 shpkg install "${SHPKG_REPO}"
-          if shpkg install "${SHPKG_REPO}"; then
+          if ( . "${SHPKG_REPO_BUILD_DIR}/share/shpkg/shpkg.subr";
+               shpkg_install "${SHPKG_REPO}"; ); then
               verbose 2 shpkg_ci_status "${SHPKG_REPO}.install.status" ok
           else
               exit 1