From e2669fcc5bf191bc4e56dbb8e917f812e83fb405 Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Mon, 5 Dec 2022 17:39:04 +0100 Subject: [PATCH] macos: pkg: Install to /usr/local/crc The package only installs 3 binaries, vfkit, admin-helper and crc, we can install these to /usr/local/crc and symlink crc to /usr/local/bin. If we keep installing crc.pkg to /Applications, macOS will show a non-functional icon in that folder since the macOS GUI logic is only available in the crc-tray package which was split from crc.pkg in the previous commits. --- Makefile | 2 +- packaging/darwin/macos-pkg-build-and-sign.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e937fe8ec6..827eb85d04 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ OKD_VERSION ?= 4.12.0-0.okd-2023-02-18-033438 BUNDLE_EXTENSION = crcbundle CRC_VERSION = 2.15.0 COMMIT_SHA=$(shell git rev-parse --short HEAD) -MACOS_INSTALL_PATH = /Applications/Red Hat OpenShift Local.app/Contents/Resources +MACOS_INSTALL_PATH = /usr/local/crc CONTAINER_RUNTIME ?= podman TOOLS_DIR := tools diff --git a/packaging/darwin/macos-pkg-build-and-sign.sh b/packaging/darwin/macos-pkg-build-and-sign.sh index 880f029d80..b36da15896 100755 --- a/packaging/darwin/macos-pkg-build-and-sign.sh +++ b/packaging/darwin/macos-pkg-build-and-sign.sh @@ -42,7 +42,7 @@ function signAppBundle() { crcRootDir="${BASEDIR}/root-crc" trayRootDir="${BASEDIR}/root-crc-tray" -crcBinDir="${crcRootDir}/Applications/Red Hat OpenShift Local.app/Contents/Resources" +crcBinDir="${crcRootDir}/usr/local/crc" version=$(cat "${BASEDIR}/VERSION")