From 377a0fcb982f79e3445f734a1f014af86c9cbdb7 Mon Sep 17 00:00:00 2001 From: Maarten van Heusden <50550545+mmvanheusden@users.noreply.github.com> Date: Sun, 17 Nov 2024 12:04:41 +0100 Subject: [PATCH] fix(workflow): truncate path --- .github/workflows/build.yml | 11 +++++------ src-tauri/src/terminal.rs | 7 +++++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f2847097..c2bf7788 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -62,22 +62,21 @@ jobs: with: args: ${{ matrix.args }} includeUpdaterJson: false - + - name: fix JSON id: truncate_paths - run: echo "::set-output name=paths::$(echo '${{ steps.build.outputs.artifactPaths }}' | sed 's/^..//' | sed 's/..$//')" - + run: echo "paths=$(echo '${{ steps.build.outputs.artifactPaths }}' | sed 's/^..//' | sed 's/..$//')" >> $GITHUB_OUTPUT - name: upload unix artifacts if: matrix.platform == 'macos-latest' || matrix.platform == 'ubuntu-22.04' uses: actions/upload-artifact@v4 with: name: build-artifacts - path: ${{ steps.build.outputs.artifactPaths }} - + path: ${{ steps.truncate_paths.outputs.paths }} + - name: upload windows artifacts if: matrix.platform == 'windows-latest' uses: actions/upload-artifact@v4 with: name: build-artifacts - path: ${{ steps.build.outputs.artifactPaths }} \ No newline at end of file + path: ${{ steps.truncate_paths.outputs.paths }} \ No newline at end of file diff --git a/src-tauri/src/terminal.rs b/src-tauri/src/terminal.rs index 19b49dc1..1adfc834 100644 --- a/src-tauri/src/terminal.rs +++ b/src-tauri/src/terminal.rs @@ -2,7 +2,6 @@ use crate::steam::SteamDownload; use async_process::Command; use serde::Serialize; use std::{env, fs}; -use std::fs::File; use std::os::unix::fs::PermissionsExt; use crate::get_os; @@ -318,7 +317,11 @@ impl Terminal { // println!("{}", download_script); fs::write("./script.sh", download_script).unwrap(); - fs::set_permissions("./script.sh", fs::Permissions::from_mode(0o755)).unwrap(); // Won't run without executable permission + + #[cfg(unix)] + { + fs::set_permissions("./script.sh", fs::Permissions::from_mode(0o755)).unwrap(); // Won't run without executable permission + } let mut cmd = Command::new("/usr/bin/open"); cmd.args(&["-a", "Terminal", "./script.sh"]);