Use switch case, revert requiredTools for linux for darwin-dmg to png2icns

Author: sidevesh

cmd/packaging/darwin-bundle.go

@@ -22,9 +22,12 @@ var DarwinBundleTask = &packagingTask{
 		if err != nil {
 			return "", err
 		}
-		cmdPng2icns := exec.Command("png2icns", filepath.Join(outputFileName, "Contents", "Resources", "icon.icns"), filepath.Join(outputFileName, "Contents", "MacOS", "assets", "icon.png"))
-		if runtime.GOOS == "darwin" {
+		var cmdPng2icns *exec.Cmd
+		switch os := runtime.GOOS; os {
+		case "darwin":
 			cmdPng2icns = exec.Command("png2icons", filepath.Join(outputFileName, "Contents", "MacOS", "assets", "icon.png"), filepath.Join(outputFileName, "Contents", "Resources", "icon"), "-icns")
+		case "linux":
+			cmdPng2icns = exec.Command("png2icns", filepath.Join(outputFileName, "Contents", "Resources", "icon.icns"), filepath.Join(outputFileName, "Contents", "MacOS", "assets", "icon.png"))
 		}
 		cmdPng2icns.Dir = tmpPath
 		cmdPng2icns.Stdout = os.Stdout
@@ -36,7 +39,7 @@ var DarwinBundleTask = &packagingTask{
 		return outputFileName, nil
 	},
 	requiredTools: map[string][]string{
-		"linux":  {"png2icons"},
+		"linux":  {"png2icns"},
 		"darwin": {"png2icons"},
 	},
 }

cmd/packaging/darwin-dmg.go

@@ -30,9 +30,13 @@ var DarwinDmgTask = &packagingTask{
 		if err != nil {
 			return "", err
 		}
-		cmdGenisoimage := exec.Command("genisoimage", "-V", packageName, "-D", "-R", "-apple", "-no-pad", "-o", outputFileName, "dmgdir")
-		if runtime.GOOS == "darwin" {
+
+		var cmdGenisoimage *exec.Cmd
+		switch os := runtime.GOOS; os {
+		case "darwin":
 			cmdGenisoimage = exec.Command("hdiutil", "create", "-volname", packageName, "-srcfolder", "dmgdir", "-ov", "-format", "UDBZ", outputFileName)
+		case "linux":
+			cmdGenisoimage = exec.Command("genisoimage", "-V", packageName, "-D", "-R", "-apple", "-no-pad", "-o", outputFileName, "dmgdir")
 		}
 		cmdGenisoimage.Dir = tmpPath
 		cmdGenisoimage.Stdout = os.Stdout

cmd/packaging/darwin-pkg.go

@@ -77,9 +77,12 @@ var DarwinPkgTask = &packagingTask{
 			return "", err
 		}
 
-		cmdMkbom := exec.Command("mkbom", "-u", "0", "-g", "80", filepath.Join("flat", "root"), filepath.Join("flat", "base.pkg", "Payload"))
-		if runtime.GOOS == "darwin" {
+		var cmdMkbom *exec.Cmd
+		switch os := runtime.GOOS; os {
+		case "darwin":
 			cmdMkbom = exec.Command("mkbom", filepath.Join("flat", "root"), filepath.Join("flat", "base.pkg", "Payload"))
+		case "linux":
+			cmdMkbom = exec.Command("mkbom", "-u", "0", "-g", "80", filepath.Join("flat", "root"), filepath.Join("flat", "base.pkg", "Payload"))
 		}
 		cmdMkbom.Dir = tmpPath
 		cmdMkbom.Stdout = os.Stdout