diff --git a/.travis/exec.sh b/.travis/exec.sh index 4609bfb..0ff8eff 100644 --- a/.travis/exec.sh +++ b/.travis/exec.sh @@ -1,6 +1,4 @@ #!/bin/bash -ex # the UID for the container yuzu user is 1027 -sudo chown -R 1027 ./ -docker run -v $(pwd):/liftinstall -t yuzuemu/build-environments:linux-liftinstall /bin/bash /liftinstall/.travis/build.sh -sudo chown -R $(id -u):$(id -g) ./ +docker run -u root -v $(pwd):/liftinstall -t yuzuemu/build-environments:linux-liftinstall /bin/bash /liftinstall/.travis/build.sh diff --git a/src/native/mod.rs b/src/native/mod.rs index 6ca049c..46e61b9 100644 --- a/src/native/mod.rs +++ b/src/native/mod.rs @@ -312,7 +312,7 @@ mod natives { name: &str, description: &str, target: &str, - args: &[&str], + args: &str, working_dir: &str, exe_path: &str, ) -> Result { diff --git a/src/tasks/install_desktop_shortcut.rs b/src/tasks/install_desktop_shortcut.rs index 246a41a..74399b5 100644 --- a/src/tasks/install_desktop_shortcut.rs +++ b/src/tasks/install_desktop_shortcut.rs @@ -100,7 +100,7 @@ impl Task for InstallDesktopShortcutTask { &shortcut.name, &shortcut.description, tool_path, - &["--launcher", exe_path], + &format!("--launcher \"{}\"", exe_path), &starting_dir, exe_path, )?);