opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 00:51:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17916 from Luap99/mac-helper-error

Browse Source 
macos pkginstaller: fix regression which caused the installer to fail
This commit is contained in:
OpenShift Merge Robot
2023-03-24 13:39:41 -04:00
committed by GitHub
parent f9beb0db09 64ba82601a
commit 67c98ec5de
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/podman-mac-helper/install.go
View File

@ -93,7 +93,8 @@ func install(cmd *cobra.Command, args []string) error {
fileName := filepath.Join("/Library", "LaunchDaemons", labelName) fileName := filepath.Join("/Library", "LaunchDaemons", labelName)
if _, err := os.Stat(fileName); err == nil || !os.IsNotExist(err) { 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) prog, err := installExecutable(userName)

3
contrib/pkginstaller/scripts/postinstall
View File

@ -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/podman-mac-helper /opt/podman/qemu/bin/podman-mac-helper
ln -s /opt/podman/bin/gvproxy /opt/podman/qemu/bin/gvproxy 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 || :