Merge pull request #31 from sonatype-nexus-community/DetectorFix

Detector fix
sonatype-nexus-community · Aug 15, 2020 · fb9c355 · fb9c355
2 parents 4279556 + 7cd9d9a
commit fb9c355
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 ahab
+ahab.exe
 vendor
 .DS_Store
 .vscode

diff --git a/packages/detector.go b/packages/detector.go
@@ -66,23 +66,12 @@ func determineIfPackageManagerInstalled(packageManager string, logger *logrus.Lo
 		if exitError, ok := err.(*exec.ExitError); ok {
 			waitStatus = exitError.Sys().(syscall.WaitStatus)
 			logger.Infof("Output 1: %s\n", []byte(fmt.Sprintf("%d", waitStatus.ExitStatus())))
-			if waitStatus == 0 {
-				return true
-			}else{
-				return false
-			}
-		}else{
-			return false
-		}
-	} else {
-		// Success
-		waitStatus = cmd.ProcessState.Sys().(syscall.WaitStatus)
-		logger.Info(string(output))
-		logger.Infof("Output 2: %s\n", []byte(fmt.Sprintf("%d", waitStatus.ExitStatus())))
-		if waitStatus == 0 {
-			return true
-		}else{
-			return false
+			return waitStatus.ExitStatus() == 0
 		}
+		return false
 	}
+	waitStatus = cmd.ProcessState.Sys().(syscall.WaitStatus)
+	logger.Info(string(output))
+	logger.Infof("Output 2: %s\n", []byte(fmt.Sprintf("%d", waitStatus.ExitStatus())))
+	return waitStatus.ExitStatus() == 0
 }