strip tmp_source

BrettMayson · Oct 18, 2024 · 63003cd · 63003cd
1 parent 2f75950
commit 63003cd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -123,10 +123,12 @@ jobs:
         if: startsWith(matrix.os.runner, 'ubuntu')
         run: |
           sudo apt-get update
-          sudo apt-get install -y wine64
+          sudo apt-get install -y wine64 xvfb
+          Xvfb :99 -screen 0 1024x768x16 &
       - name: Run `hemtt build` on ${{ matrix.mod.repo }}
         env:
           HEMTT_BI_TOOLS: /tmp/arma3tools
+          DISPLAY: :99.0
         run: |
           cd mod && hemtt build
       - name: Tree

diff --git a/bin/src/modules/binarize/mod.rs b/bin/src/modules/binarize/mod.rs
@@ -274,8 +274,14 @@ impl Module for Binarize {
                     "-always",
                     "-silent",
                     "-maxProcesses=0",
-                    &target.source.replace('/', "\\"),
-                    &target.output.replace('/', "\\"),
+                    &target
+                        .source
+                        .trim_start_matches(tmp_source.to_str().expect("path is valid utf-8"))
+                        .replace('/', "\\"),
+                    &target
+                        .output
+                        .trim_start_matches(tmp_source.to_str().expect("path is valid utf-8"))
+                        .replace('/', "\\"),
                     &target.entry.replace('/', "\\"),
                 ])
                 .current_dir(&tmp_source);