Merge branch 'master' of https://github.com/equinoxhq/equinox into add-nix-flake

Author: xTrayambak

src/container/utils/exec.nim

@@ -1,5 +1,5 @@
 ## All the utilities for executing commands
-import std/[osproc, options, logging, strutils]
+import std/[os, osproc, options, logging, strutils]
 
 proc readOutput*(bin: string, cmd: string): Option[string] =
   let command = bin & ' ' & cmd
@@ -9,8 +9,8 @@ proc readOutput*(bin: string, cmd: string): Option[string] =
 
   some(res.output.strip())
 
-proc runCmd*(bin: string, cmd: string): bool {.discardable.} =
-  let command = bin & ' ' & cmd
+proc runCmd*(bin: string, cmd: string, resolve: bool = false): bool {.discardable.} =
+  let command = (if resolve: findExe(bin) else: bin) & ' ' & cmd
   debug "runCmd(" & command & ')'
 
   execCmd(command) == 0

src/equinox_gui.nim

@@ -60,7 +60,7 @@ proc main() {.inline.} =
   of "mime-handler":
     let env = getXdgEnv(input)
     discard execCmd(
-      "pkexec " & env.equinoxPath & " launch-game-uri " & input.arguments[0] & " --user:" &
+      "pkexec".findExe & ' ' & env.equinoxPath & " launch-game-uri " & input.arguments[0] & " --user:" &
         env.user & " --uid:" & $getuid() & " --gid:" & $getgid() & " --wayland-display:" &
         env.waylandDisplay & " --xdg-runtime-dir:" & env.runtimeDir
     )

src/gui/onboard.nim

@@ -222,6 +222,7 @@ proc waitForCommands*(env: XdgEnv, fd: cint) =
         env.equinoxPath & " init --xdg-runtime-dir:" & env.runtimeDir &
           " --wayland-display:" & env.waylandDisplay & " --user:" & env.user & " --uid:" &
           $getuid() & " --gid:" & $getgid(),
+        resolve = true
       ):
         fd.send(OnboardMagic.InitSuccess)
       else:
@@ -236,9 +237,10 @@ proc waitForCommands*(env: XdgEnv, fd: cint) =
         env.equinoxPath & " run --warmup --user:" & env.user & " --uid:" & $getuid() &
           " --gid:" & $getgid() & " --wayland-display:" & env.waylandDisplay &
           " --xdg-runtime-dir:" & getEnv("XDG_RUNTIME_DIR"),
+        resolve = true
       )
     of OnboardMagic.StopContainer:
-      discard runCmd("pkexec", env.equinoxPath & " halt --force")
+      discard runCmd("pkexec", env.equinoxPath & " halt --force", resolve = true)
 
 proc runOnboardingApp*(input: Input) =
   let pair = initIpcFds()