Change install path of crc to /Applications/CodeReady Containers.app

It uses the tray as a conveyor for the full crc application.
Everything is installed in /Applications/CodeReady Containers.app.
If the user wants to uninstall the app, he just has to drag and drop the
app in the trash (after running crc cleanup).

When upgrading, all files will be replaced with newer. There is no more
one directory per version.

Author: guillaumerose

Makefile

@@ -4,7 +4,7 @@ BUNDLE_VERSION = 4.7.4
 BUNDLE_EXTENSION = crcbundle
 CRC_VERSION = 1.24.0
 COMMIT_SHA=$(shell git rev-parse --short HEAD)
-MACOS_INSTALL_PATH = /Library/CodeReady Containers
+MACOS_INSTALL_PATH = /Applications/CodeReady Containers.app/Contents/Resources/
 CONTAINER_RUNTIME ?= podman
 
 ifdef OKD_VERSION
@@ -252,20 +252,26 @@ update-go-version:
 goversioncheck:
 	./verify-go-version.sh
 
+TRAY_RELEASE ?= packaging/tmp/crc-tray-macos.tar.gz
+
 packagedir: LDFLAGS+= -X '$(REPOPATH)/pkg/crc/version.macosInstallPath=$(MACOS_INSTALL_PATH)' $(RELEASE_VERSION_VARIABLES)
 packagedir: clean check_bundledir $(BUILD_DIR)/macos-amd64/crc $(HOST_BUILD_DIR)/crc-embedder
+	echo -n $(CRC_VERSION) > packaging/VERSION
 	sed -e 's/__VERSION__/'$(CRC_VERSION)'/g' -e 's@__INSTALL_PATH__@$(MACOS_INSTALL_PATH)@g' packaging/darwin/Distribution.in >packaging/darwin/Distribution
 	sed -e 's/__VERSION__/'$(CRC_VERSION)'/g' -e 's@__INSTALL_PATH__@$(MACOS_INSTALL_PATH)@g' packaging/darwin/welcome.html.in >packaging/darwin/Resources/welcome.html
 	sed -e 's/__VERSION__/'$(CRC_VERSION)'/g' -e 's@__INSTALL_PATH__@$(MACOS_INSTALL_PATH)@g' packaging/darwin/postinstall.in >packaging/darwin/scripts/postinstall
 	chmod 755 packaging/darwin/scripts/postinstall
-	mkdir -p packaging/root/"$(MACOS_INSTALL_PATH)"/$(CRC_VERSION)/
-	$(HOST_BUILD_DIR)/crc-embedder download packaging/root/"$(MACOS_INSTALL_PATH)"/$(CRC_VERSION)/
+	mkdir -p packaging/tmp/
+	$(HOST_BUILD_DIR)/crc-embedder download packaging/tmp/
+
+	mkdir -p packaging/root/Applications
+	tar -C packaging/root/Applications -xvzf $(TRAY_RELEASE)
+	rm packaging/tmp/crc-tray-macos.tar.gz
 
-	tar -C packaging/root/"$(MACOS_INSTALL_PATH)"/$(CRC_VERSION)/ -xvzf packaging/root/"$(MACOS_INSTALL_PATH)"/$(CRC_VERSION)/crc-tray-macos.tar.gz
-	rm packaging/root/"$(MACOS_INSTALL_PATH)"/$(CRC_VERSION)/crc-tray-macos.tar.gz
+	mv packaging/tmp/* packaging/root/"$(MACOS_INSTALL_PATH)"
 
-	cp $(HYPERKIT_BUNDLENAME) packaging/root/"$(MACOS_INSTALL_PATH)"/$(CRC_VERSION)/
-	cp $(BUILD_DIR)/macos-amd64/crc packaging/root/"$(MACOS_INSTALL_PATH)"/$(CRC_VERSION)/
+	cp $(HYPERKIT_BUNDLENAME) packaging/root/"$(MACOS_INSTALL_PATH)"
+	cp $(BUILD_DIR)/macos-amd64/crc packaging/root/"$(MACOS_INSTALL_PATH)"
 	cp LICENSE packaging/darwin/Resources/LICENSE.txt
 	pkgbuild --analyze --root packaging/root packaging/components.plist
 	plutil -replace BundleIsRelocatable -bool NO packaging/components.plist

packaging/.gitignore

@@ -4,3 +4,4 @@ root/
 /darwin/Resources/LICENSE.txt
 /darwin/Resources/welcome.html
 /darwin/scripts/postinstall
+/VERSION

packaging/darwin/postinstall.in

@@ -1,10 +1,10 @@
 #!/bin/bash
 set -e
 
-chmod 755 "__INSTALL_PATH__"/__VERSION__/crc
+chmod 755 "__INSTALL_PATH__"/crc
 
 [ -d /usr/local/bin ] || mkdir /usr/local/bin
 
 rm -f /usr/local/bin/crc
 
-ln -s "__INSTALL_PATH__"/__VERSION__/crc /usr/local/bin/crc
+ln -s "__INSTALL_PATH__"/crc /usr/local/bin/crc

packaging/package.sh

@@ -19,17 +19,19 @@ function sign() {
   codesign --deep --sign "${CODESIGN_IDENTITY}" --options runtime --force ${opts} "$1"
 }
 
-version=$(ls "${BASEDIR}/root/Library/CodeReady Containers/")
+binDir="${BASEDIR}/root/Applications/CodeReady Containers.app/Contents/Resources"
+
+version=$(cat "${BASEDIR}/VERSION")
 
-binDir="${BASEDIR}/root/Library/CodeReady Containers/${version}"
 sign "${binDir}/crc"
 sign "${binDir}/admin-helper-darwin"
 sign "${binDir}/crc-driver-hyperkit"
-sign "${binDir}/CodeReady Containers.app"
+
+sign "${BASEDIR}/root/Applications/CodeReady Containers.app"
 
 codesign --verify --verbose "${binDir}/hyperkit"
 
-pkgbuild --identifier com.redhat.crc.${version} --version ${version} \
+pkgbuild --identifier com.redhat.crc --version ${version} \
   --scripts "${BASEDIR}/darwin/scripts" \
   --root "${BASEDIR}/root" \
   --install-location / \

pkg/crc/constants/constants.go

@@ -106,7 +106,7 @@ var (
 
 func defaultBundlePath() string {
 	if runtime.GOOS == "darwin" && version.IsMacosInstallPathSet() {
-		path := filepath.Join(version.GetMacosInstallPath(), version.GetCRCVersion(), GetDefaultBundle())
+		path := filepath.Join(version.GetMacosInstallPath(), GetDefaultBundle())
 		if _, err := os.Stat(path); err == nil {
 			return path
 		}

pkg/crc/constants/constants_darwin.go

@@ -23,7 +23,7 @@ var (
 
 func trayAppBundlePath() string {
 	if version.IsMacosInstallPathSet() {
-		path := filepath.Join(version.GetMacosInstallPath(), version.GetCRCVersion(), TrayExecutableName)
+		path := filepath.Join(filepath.Dir(filepath.Dir(version.GetMacosInstallPath())), TrayExecutableName)
 		if _, err := os.Stat(path); err == nil {
 			return path
 		}

pkg/embed/embed.go

@@ -14,7 +14,7 @@ import (
 
 func openEmbeddedFile(executablePath, embedName string) (io.ReadCloser, error) {
 	if runtime.GOOS == "darwin" && version.IsMacosInstallPathSet() {
-		path := filepath.Join(version.GetMacosInstallPath(), version.GetCRCVersion(), embedName)
+		path := filepath.Join(version.GetMacosInstallPath(), embedName)
 		if _, err := os.Stat(path); err == nil {
 			return os.Open(path)
 		}