Mac installer

.gitignore

@@ -44,3 +44,9 @@ static/skywire-manager-src/dist/*
 /dist-linux
 /dist
 Char
+/scripts/mac_installer/IconsSkycoin.tar.gz
+/scripts/mac_installer/[email protected]
+/scripts/mac_installer/[email protected]
+/mac_build
+/SkywireInstaller*.pkg
+*.dmg

Makefile

@@ -54,6 +54,8 @@ build-systray: host-apps-systray bin-systray ## Install dependencies, build apps
 
 build-static: host-apps-static bin-static ## Build apps and binaries. `go build` with ${OPTS}
 
+installer: mac-installer ## Builds MacOS installer for skywire-visor
+
 install-generate: ## Installs required execs for go generate.
 	${OPTS} go install github.com/mjibson/esc
 	${OPTS} go install github.com/vektra/mockery/cmd/mockery
@@ -213,5 +215,8 @@ build-ui: install-deps-ui  ## Builds the UI
 	mkdir ${MANAGER_UI_BUILT_DIR}
 	cp -r ${MANAGER_UI_DIR}/dist/. ${MANAGER_UI_BUILT_DIR}
 
+mac-installer: ## Create unsigned application
+	./scripts/mac_installer/create_installer.sh
+
 help:
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'

cmd/skywire-cli/commands/visor/gen-config.go

@@ -5,6 +5,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"runtime"
 	"strings"
 
 	"github.com/sirupsen/logrus"
@@ -62,10 +63,19 @@ var genConfigCmd = &cobra.Command{
 
 		//set output for package and skybian configs
 		if packageConfig {
+			var basedir string
+
+			switch runtime.GOOS {
+			case "darwin":
+				basedir = "/usr/local/opt/skywire" //
+			default:
+				basedir = "/opt/skywire"
+			}
+
 			if hypervisor {
-				output = "/opt/skywire/skywire.json"
+				output = filepath.Join(basedir, "skywire.json")
 			} else {
-				output = "/opt/skywire/skywire-visor.json"
+				output = filepath.Join(basedir, "skywire-visor.json")
 			}
 		}
 		if skybianConfig {

cmd/skywire-visor/commands/root.go

@@ -143,14 +143,10 @@ func runVisor(args []string) {
 	ctx, cancel := cmdutil.SignalContext(context.Background(), log)
 	setStopFunction(log, cancel, v.Close)
 
-	defer cancel()
-
 	// Wait.
 	<-ctx.Done()
 
-	if err = v.Close(); err != nil {
-		log.Error("Error closing visor: ", err)
-	}
+	stopVisorFn()
 }
 
 // Execute executes root CLI command.

cmd/skywire-visor/commands/systray.go

@@ -36,16 +36,20 @@ func runApp(args ...string) {
 
 }
 
-func setStopFunction(log *logging.MasterLogger, cancel context.CancelFunc, stopVisorFn func() error) {
+func setStopFunction(log *logging.MasterLogger, cancel context.CancelFunc, fn func() error) {
 	stopVisorWg.Add(1)
 	defer stopVisorWg.Done()
 
-	gui.SetStopVisorFn(func() {
-		if err := stopVisorFn(); err != nil {
+	stopVisorFn = func() {
+		if err := fn(); err != nil {
 			log.WithError(err).Error("Visor closed with error.")
 		}
 		cancel()
 		stopVisorWg.Wait()
+	}
+
+	gui.SetStopVisorFn(func() {
+		stopVisorFn()
 	})
 }
 

docs/systray-builds.md

@@ -60,7 +60,7 @@ $ gnome-extensions enable [email protected]
 
 #### Mac / Darwin
 
-You need to have an icon defined in `/Applications/Skywire.app/Contents/Resources/tray_icon.png`
+You need to have an icon defined in `/Applications/Skywire.app/Contents/Resources/icon.tiff`
 
 #### Windows
 

go.mod

@@ -43,7 +43,7 @@ require (
 	github.com/xtaci/lossyconn v0.0.0-20200209145036-adba10fffc37 // indirect
 	go.etcd.io/bbolt v1.3.5
 	golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a // indirect
-	golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d
+	golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d // indirect
 	golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4
 	golang.org/x/sys v0.0.0-20210608053332-aa57babbf139
 	golang.org/x/term v0.0.0-20210503060354-a79de5458b56 // indirect

internal/gui/gui.go

@@ -1,4 +1,5 @@
-//+build systray
+//go:build systray
+// +build systray
 
 package gui
 
@@ -49,10 +50,10 @@ var (
 func GetOnGUIReady(icon []byte, conf *visorconfig.V1) func() {
 	doneCh := make(chan bool, 1)
 	return func() {
-		systray.SetTooltip("Skywire")
-
 		systray.SetTemplateIcon(icon, icon)
 
+		systray.SetTooltip("Skywire")
+
 		initOpenHypervisorBtn(conf)
 		//initVpnClientBtn()
 		initUninstallBtn()
@@ -66,14 +67,10 @@ func GetOnGUIReady(icon []byte, conf *visorconfig.V1) func() {
 
 // OnGUIQuit is executed on GUI exit.
 func OnGUIQuit() {
-
 }
 
 // ReadSysTrayIcon reads system tray icon.
 func ReadSysTrayIcon() ([]byte, error) {
-	if err := preReadIcon(); err != nil {
-		return nil, err
-	}
 	contents, err := ioutil.ReadFile(iconPath)
 	if err != nil {
 		return nil, fmt.Errorf("failed to read icon: %w", err)

internal/gui/gui_darwin.go

@@ -3,41 +3,15 @@
 package gui
 
 import (
-	"image/png"
 	"os"
-
-	"golang.org/x/image/tiff"
 )
 
 const (
-	pngIconPath     = "/Applications/Skywire.app/Contents/Resources/icon.png"
-	iconPath        = "/Applications/Skywire.app/Contents/Resources/tray_icon.tiff"
+	iconPath = "/Applications/Skywire.app/Contents/Resources/icon.tiff"
 	deinstallerPath = "/Applications/Skywire.app/Contents/deinstaller"
 	appPath = "/Applications/Skywire.app"
 )
 
-func preReadIcon() error {
-	imgFile, err := os.Open(pngIconPath)
-	if err != nil {
-		return err
-	}
-	img, err := png.Decode(imgFile)
-	if err != nil {
-		return err
-	}
-
-	tiffFile, err := os.Create(iconPath)
-	if err != nil {
-		return err
-	}
-
-	if err = tiff.Encode(tiffFile, img, nil); err != nil {
-		return err
-	}
-
-	return tiffFile.Close()
-}
-
 func checkIsPackage() bool {
 	_, err := os.Stat(appPath)
 	return err == nil

internal/gui/gui_linux.go

@@ -12,10 +12,6 @@ const (
 	deinstallerPath = "/opt/skywire/deinstaller"
 )
 
-func preReadIcon() error {
-	return nil
-}
-
 func checkIsPackage() bool {
 	_, err := os.Stat(deinstallerPath)
 	return err == nil

internal/gui/gui_windows.go

@@ -21,10 +21,6 @@ func platformExecUninstall() error {
 	return osutil.Run("pwsh", "-c", deinstallerPath)
 }
 
-func preReadIcon() error {
-	return nil
-}
-
 func checkIsPackage() bool {
 	_, err := os.Stat(deinstallerPath())
 	return err == nil

scripts/mac_installer/AppInfo.plist

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDisplayName</key>
+	<string>Skywire</string>
+	<key>CFBundleExecutable</key>
+	<string>Skywire</string>
+	<key>CFBundleIconFile</key>
+	<string>icon.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.skycoin.skywire</string>
+	<key>CFBundleName</key>
+	<string>Skywire</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>NSRequiresAquaSystemAppearance</key>
+	<false/>
+	<key>NSSupportsAutomaticGraphicsSwitching</key>
+	<true/>
+</dict>
+</plist>

scripts/mac_installer/Distribution.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<installer-gui-script minSpecVersion="1">
+    <pkg-ref id="com.skycoin.skywire.visor"/>
+    <options customize="never" require-scripts="false"/>
+    <choices-outline>
+        <line choice="default">
+            <line choice="com.skycoin.skywire.visor"/>
+        </line>
+    </choices-outline>
+    <choice id="default"/>
+    <choice id="com.skycoin.skywire.visor" visible="false">
+        <pkg-ref id="com.skycoin.skywire.visor"/>
+    </choice>
+    <pkg-ref id="com.skycoin.skywire.visor" version="0" onConclusion="none">installer.pkg</pkg-ref>
+    <title>Skywire</title>
+</installer-gui-script>

scripts/mac_installer/Distribution_customized.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<installer-gui-script minSpecVersion="1">
+    <pkg-ref id="com.skycoin.skywire.visor"/>
+    <pkg-ref id="com.skycoin.skywire.updater"/>
+    <pkg-ref id="com.skycoin.skywire.remover"/>
+    <pkg-ref id="com.skycoin.skywire.visor" version="0" onConclusion="none">installer.pkg</pkg-ref>
+    <pkg-ref id="com.skycoin.skywire.updater" version="0" onConclusion="none">updater.pkg</pkg-ref>
+    <pkg-ref id="com.skycoin.skywire.remover" version="0" onConclusion="none">remover.pkg</pkg-ref>
+    <allowed-os-versions>
+        <os-version min="10.10"/>
+    </allowed-os-versions>
+    <options customize="allow" require-scripts="false" rootVolumeOnly="true" hostArchitectures="x86_64,arm64"/>
+    <title>Skywire</title>
+    <script>
+        <![CDATA[
+function is_skywire_installed() {
+  return system.files.fileExistsAtPath("/Applications/Skywire.app");
+}
+]]>
+    </script>
+    <choices-outline>
+        <line choice="install"/>
+        <line choice="update"/>
+        <line choice="remove"/>
+    </choices-outline>
+    <choice id="install" title="Install" description="Install Skywire" start_selected="!is_skywire_installed()" visible="!is_skywire_installed()">
+        <pkg-ref id="com.skycoin.skywire.visor"/>
+    </choice>
+    <choice id="update" title="Update" description="Update current installation" visible="is_skywire_installed()" start_selected="is_skywire_installed()">
+        <pkg-ref id="com.skycoin.skywire.updater"/>
+    </choice>
+    <choice id="remove" title="Remove" description="Remove current installation" visible="is_skywire_installed()" start_selected="false">
+        <pkg-ref id="com.skycoin.skywire.remover"/>
+    </choice>
+</installer-gui-script>