fix kamal installation

fluentci-io · Jul 17, 2024 · b89855d · b89855d
1 parent abcd658
commit b89855d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -30,6 +30,7 @@ jobs:
       - name: Show kamal version
         run: |
           fluentci run --wasm . help
+          flox activate -- type kamal
           flox activate -- kamal version
         working-directory: example
         env:

diff --git a/src/helpers.rs b/src/helpers.rs
@@ -28,14 +28,11 @@ pub fn setup() -> Result<(), Error> {
     dag()
         .pipeline("setup kamal")?
         .flox()?
-        .with_exec(vec!["flox", "install", "ruby"])?
-        .with_exec(vec!["gem", "install", "kamal"])?
+        .with_exec(vec!["type ruby /dev/null 2> /dev/null || flox install ruby"])?
+        .with_exec(vec!["type kamal /dev/null 2> /dev/null || gem install --user-install kamal"])?
         .with_exec(vec!["[ -d $HOME/.local/bin ] || mkdir -p $HOME/.local/bin"])?
         .with_exec(vec![
-            "ln",
-            "-s",
-            "`gem environment gemhome`/bin/kamal",
-            "$HOME/.local/bin/kamal",
+            "[ -f $HOME/.local/bin/kamal ] || ln -s `gem environment user_gemhome`/bin/kamal $HOME/.local/bin/kamal",
         ])?
         .stdout()?;
     Ok(())