diff options
| author | Ophestra <cat@gensokyo.uk> | 2025-02-21 17:50:20 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2025-02-21 17:50:20 +0900 |
| commit | 4fa1e97026006a9b5d4e98de302256c7ae7cbad7 (patch) | |
| tree | 929c0cdc10cbb58933ebbdd87d0cd5407dcf8b29 /cmd/fpkg/with.go | |
| parent | 64b6dc41ba76fca1656374775f5fa57c4b6b39f1 (diff) | |
cmd/fpkg: rename shell to shellPath
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'cmd/fpkg/with.go')
| -rw-r--r-- | cmd/fpkg/with.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd/fpkg/with.go b/cmd/fpkg/with.go index 6f5b225e..b6928bd1 100644 --- a/cmd/fpkg/with.go +++ b/cmd/fpkg/with.go @@ -15,7 +15,7 @@ func withNixDaemon( ) { fortifyAppDropShell(updateConfig(&fst.Config{ ID: app.ID, - Command: []string{shell, "-lc", "rm -f /nix/var/nix/daemon-socket/socket && " + + Command: []string{shellPath, "-lc", "rm -f /nix/var/nix/daemon-socket/socket && " + // start nix-daemon "nix-daemon --store / & " + // wait for socket to appear @@ -59,7 +59,7 @@ func withNixDaemon( func withCacheDir(action string, command []string, workDir string, app *bundleInfo, pathSet *appPathSet, dropShell bool, beforeFail func()) { fortifyAppDropShell(&fst.Config{ ID: app.ID, - Command: []string{shell, "-lc", strings.Join(command, " && ")}, + Command: []string{shellPath, "-lc", strings.Join(command, " && ")}, Confinement: fst.ConfinementConfig{ AppID: app.AppID, Username: "nixos", @@ -92,7 +92,7 @@ func withCacheDir(action string, command []string, workDir string, app *bundleIn func fortifyAppDropShell(config *fst.Config, dropShell bool, beforeFail func()) { if dropShell { - config.Command = []string{shell, "-l"} + config.Command = []string{shellPath, "-l"} fortifyApp(config, beforeFail) beforeFail() internal.Exit(0) |