From 8b98faa4415af8ff5f3b690bd63962e50da07c46 Mon Sep 17 00:00:00 2001 From: Cuong Manh Le Date: Mon, 5 Aug 2024 23:36:56 +0700 Subject: [PATCH] cmd/cli: do not mask err argument of selfUninstall The err should be preserved, so if we passed the error around, other functions could still check for utility error code correctly. --- cmd/cli/self_kill_unix.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/cli/self_kill_unix.go b/cmd/cli/self_kill_unix.go index 95767fe..a7dc1f1 100644 --- a/cmd/cli/self_kill_unix.go +++ b/cmd/cli/self_kill_unix.go @@ -14,15 +14,15 @@ import ( "github.com/rs/zerolog" ) -func selfUninstall(err error, p *prog, logger zerolog.Logger) { +func selfUninstall(uninstallErr error, p *prog, logger zerolog.Logger) { var uer *controld.UtilityErrorResponse - if errors.As(err, &uer) && uer.ErrorField.Code == controld.InvalidConfigCode { + if errors.As(uninstallErr, &uer) && uer.ErrorField.Code == controld.InvalidConfigCode { if runtime.GOOS == "linux" { s, err := newService(p, svcConfig) if err != nil { logger.Warn().Err(err).Msg("failed to create new service") } else { - selfUninstallLinux(err, p, logger) + selfUninstallLinux(uninstallErr, p, logger) _ = s.Stop() os.Exit(0) }