mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-01-29 07:52:50 -05:00
core: preserve quickshell exit code
This commit is contained in:
@@ -18,6 +18,25 @@ import (
|
|||||||
|
|
||||||
type ipcTargets map[string]map[string][]string
|
type ipcTargets map[string]map[string][]string
|
||||||
|
|
||||||
|
// getProcessExitCode returns the exit code from a ProcessState.
|
||||||
|
// For normal exits, returns the exit code directly.
|
||||||
|
// For signal termination, returns 128 + signal number (Unix convention).
|
||||||
|
func getProcessExitCode(state *os.ProcessState) int {
|
||||||
|
if state == nil {
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
if code := state.ExitCode(); code != -1 {
|
||||||
|
return code
|
||||||
|
}
|
||||||
|
// Process was killed by signal - extract signal number
|
||||||
|
if status, ok := state.Sys().(syscall.WaitStatus); ok {
|
||||||
|
if status.Signaled() {
|
||||||
|
return 128 + int(status.Signal())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
var isSessionManaged bool
|
var isSessionManaged bool
|
||||||
|
|
||||||
func execDetachedRestart(targetPID int) {
|
func execDetachedRestart(targetPID int) {
|
||||||
@@ -235,7 +254,7 @@ func runShellInteractive(session bool) {
|
|||||||
cmd.Process.Signal(syscall.SIGTERM)
|
cmd.Process.Signal(syscall.SIGTERM)
|
||||||
}
|
}
|
||||||
os.Remove(socketPath)
|
os.Remove(socketPath)
|
||||||
os.Exit(1)
|
os.Exit(getProcessExitCode(cmd.ProcessState))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -460,7 +479,7 @@ func runShellDaemon(session bool) {
|
|||||||
cmd.Process.Signal(syscall.SIGTERM)
|
cmd.Process.Signal(syscall.SIGTERM)
|
||||||
}
|
}
|
||||||
os.Remove(socketPath)
|
os.Remove(socketPath)
|
||||||
os.Exit(1)
|
os.Exit(getProcessExitCode(cmd.ProcessState))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user