fix: correct condition

Author: dnitsch

Makefile

@@ -67,7 +67,7 @@ func newSamlCmd(r *Root) {
 				return err
 			}
 
-			allRoles := credentialexchange.MergeRoleChain(flags.role, r.rootFlags.roleChain, sc.flags.isSso)
+			allRoles := credentialexchange.MergeRoleChain(flags.role, r.rootFlags.roleChain, flags.isSso)
 			conf := credentialexchange.CredentialConfig{
 				ProviderUrl:  flags.providerUrl,
 				PrincipalArn: flags.principalArn,

cmd/saml.go

@@ -74,7 +74,7 @@ tasks:
       - |
         mkdir -p .deps
         ldflags="-s -w -X \"github.com/{{.RepoOwner}}/{{.BinName}}/cmd.Version={{.Version}}\" -X \"github.com/{{.RepoOwner}}/{{.BinName}}/cmd.Revision={{.Revision}}\" -extldflags -static"
-        CGO_ENABLED=0 GOPATH=$PWD/.deps GOOS=${BUILD_GOOS} GOARCH=${BUILD_GOARCH} go build -mod=readonly -buildvcs=false -ldflags="$ldflags" -o dist/{{.BinName}}-${BUILD_GOOS}${BUILD_GOARCH} .
+        CGO_ENABLED=0 GOPATH=$PWD/.deps GOOS=${BUILD_GOOS} GOARCH=${BUILD_GOARCH} go build -mod=readonly -buildvcs=false -ldflags="$ldflags" -o dist/{{.BinName}}-${BUILD_GOOS}-${BUILD_GOARCH} .
     variations:
       - BUILD_GOOS: windows
         BUILD_GOARCH: amd64

eirctl.yaml

@@ -227,7 +227,7 @@ func (web *Web) MustClose() {
 	utils.Sleep(0.5)
 	// remove process just in case
 	// os.Process is cross platform safe way to remove a process
-	if osprocess, err := os.FindProcess(web.launcher.PID()); err != nil {
-		osprocess.Kill()
+	if osprocess, err := os.FindProcess(web.launcher.PID()); err == nil && osprocess != nil {
+		_ = osprocess.Kill()
 	}
 }