Merge pull request #17919 from openshift-cherrypick-robot/cherry-pick…

…-17916-to-v4.4 [v4.4] macos pkginstaller: fix regression which caused the installer to fail
containers · Mar 27, 2023 · 439fa3d · 439fa3d
2 parents 6172f29 + c856dd1
commit 439fa3d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cmd/podman-mac-helper/install.go b/cmd/podman-mac-helper/install.go
@@ -93,7 +93,8 @@ func install(cmd *cobra.Command, args []string) error {
 	fileName := filepath.Join("/Library", "LaunchDaemons", labelName)
 
 	if _, err := os.Stat(fileName); err == nil || !os.IsNotExist(err) {
-		return errors.New("helper is already installed, uninstall first")
+		fmt.Fprintln(os.Stderr, "helper is already installed, skipping the install, uninstall first if you want to reinstall")
+		return nil
 	}
 
 	prog, err := installExecutable(userName)

diff --git a/contrib/pkginstaller/scripts/postinstall b/contrib/pkginstaller/scripts/postinstall
@@ -7,4 +7,5 @@ echo "/opt/podman/bin" > /etc/paths.d/podman-pkg
 ln -s /opt/podman/bin/podman-mac-helper /opt/podman/qemu/bin/podman-mac-helper
 ln -s /opt/podman/bin/gvproxy /opt/podman/qemu/bin/gvproxy
 
-/opt/podman/bin/podman-mac-helper install
+# make sure to ignore errors, this is not a hard requirement to use podman
+/opt/podman/bin/podman-mac-helper install || :