Commit beca090100a05e4c75e81b67ba2cc365d87e3eca

Thomas de Grivel 2023-11-05T10:52:24

wip Darwin

diff --git a/lib/rbpkg/repo.rb b/lib/rbpkg/repo.rb
index f42b70e..b5fbc88 100644
--- a/lib/rbpkg/repo.rb
+++ b/lib/rbpkg/repo.rb
@@ -65,14 +65,14 @@ class Rbpkg::Repo
     sh_ci_dir = sh_quote(ci_dir)
     sh_ci_profile = sh_quote(ci_dir + '/etc/profile')
     cmd! "#{sh_quote(Rbpkg.dir)}/bin/rbpkg_bootstrap -f #{sh_quote(ci_dir)}"
-    cmd! "export RBPKG_DIR=#{sh_ci_dir} && . ~/.profile && . #{sh_ci_profile} && rbpkg clone #{sh_name}"
-    cmd! "export RBPKG_DIR=#{sh_ci_dir} && . ~/.profile && . #{sh_ci_profile} && rbpkg checkout #{sh_quote(commit)} #{sh_name}" if commit
-    cmd! "export RBPKG_DIR=#{sh_ci_dir} && . ~/.profile && . #{sh_ci_profile} && rbpkg info #{sh_name}"
-    cmd! "export RBPKG_DIR=#{sh_ci_dir} && . ~/.profile && . #{sh_ci_profile} && rbpkg configure #{sh_name}"
-    cmd! "export RBPKG_DIR=#{sh_ci_dir} && . ~/.profile && . #{sh_ci_profile} && rbpkg build #{sh_name}"
-    cmd! "export RBPKG_DIR=#{sh_ci_dir} && . ~/.profile && . #{sh_ci_profile} && rbpkg test #{sh_name}"
-    cmd! "export RBPKG_DIR=#{sh_ci_dir} && . ~/.profile && . #{sh_ci_profile} && rbpkg install #{sh_name}"
-    cmd! "export RBPKG_DIR=#{sh_ci_dir} && . ~/.profile && . #{sh_ci_profile} && rbpkg info #{sh_name}"
+    cmd! "export RBPKG_DIR=#{sh_ci_dir}; . ~/.profile; . #{sh_ci_profile}; rbpkg clone #{sh_name}"
+    cmd! "export RBPKG_DIR=#{sh_ci_dir}; . ~/.profile; . #{sh_ci_profile}; rbpkg checkout #{sh_quote(commit)} #{sh_name}" if commit
+    cmd! "export RBPKG_DIR=#{sh_ci_dir}; . ~/.profile; . #{sh_ci_profile}; rbpkg info #{sh_name}"
+    cmd! "export RBPKG_DIR=#{sh_ci_dir}; . ~/.profile; . #{sh_ci_profile}; rbpkg configure #{sh_name}"
+    cmd! "export RBPKG_DIR=#{sh_ci_dir}; . ~/.profile; . #{sh_ci_profile}; rbpkg build #{sh_name}"
+    cmd! "export RBPKG_DIR=#{sh_ci_dir}; . ~/.profile; . #{sh_ci_profile}; rbpkg test #{sh_name}"
+    cmd! "export RBPKG_DIR=#{sh_ci_dir}; . ~/.profile; . #{sh_ci_profile}; rbpkg install #{sh_name}"
+    cmd! "export RBPKG_DIR=#{sh_ci_dir}; . ~/.profile; . #{sh_ci_profile}; rbpkg info #{sh_name}"
     Rbpkg::Log.ok(ci_log_name_commit(commit))
   end