macos: pkg: Install tray in 'Red Hat OpenShift Local.app'

Now that the crc binaries are installed in /usr/local/bin, we can
put back the tray files in 'Red Hat OpenShift Local.app' rather than in
a separate 'Red Hat OpenShift Local Tray.app' directory.

Makefile

@@ -328,7 +328,7 @@ packagedir: clean embed-download-darwin macos-universal-binary
 	# crc-tray.pkg
 	tar -C $(EMBED_DOWNLOAD_DIR) -xvzf $(EMBED_DOWNLOAD_DIR)/$(TRAY_TARBALL)
 	rm $(EMBED_DOWNLOAD_DIR)/$(TRAY_TARBALL)
-	mv $(EMBED_DOWNLOAD_DIR)/crc-tray-darwin-universal/crc-tray.app packaging/darwin/root-crc-tray/Applications/Red\ Hat\ OpenShift\ Local\ Tray.app
+	mv $(EMBED_DOWNLOAD_DIR)/crc-tray-darwin-universal/crc-tray.app packaging/darwin/root-crc-tray/Applications/Red\ Hat\ OpenShift\ Local.app
 	rm -fr $(EMBED_DOWNLOAD_DIR)/crc-tray-darwin-universal
 
 	# crc.pkg

packaging/darwin/macos-pkg-build-and-sign.sh

@@ -55,7 +55,7 @@ sign "${crcBinDir}/crc"
 sign "${crcBinDir}/crc-admin-helper-darwin"
 sign "${crcBinDir}/vfkit"
 
-signAppBundle "${trayRootDir}/Applications/Red Hat OpenShift Local Tray.app"
+signAppBundle "${trayRootDir}/Applications/Red Hat OpenShift Local.app"
 
 sudo chmod +sx "${crcBinDir}/crc-admin-helper-darwin"