Mac installer

.gitignore

@@ -44,3 +44,10 @@ static/skywire-manager-src/dist/*
 /dist-linux
 /dist
 Char
+/scripts/mac_installer/IconsSkycoin.tar.gz
+/scripts/mac_installer/icon_128x128.png
+/scripts/mac_installer/icon_128x128@2x.png
+/mac_build
+/SkywireInstaller*.pkg
+*.dmg
+/scripts/mac_installer/icon.iconset/

Makefile

@@ -53,6 +53,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
@@ -78,9 +80,6 @@ install-static: ## Install `skywire-visor`, `skywire-cli`, `setup-node`
 lint: ## Run linters. Use make install-linters first
 	${OPTS} golangci-lint run -c .golangci.yml ./...
 
-lint-windows-appveyor:
-	C:\Users\appveyor\go\bin\golangci-lint run -c .golangci.yml ./...
-
 test: ## Run tests
 	-go clean -testcache &>/dev/null
 	${OPTS} go test ${TEST_OPTS} ./internal/...
@@ -155,7 +154,7 @@ build-deploy: ## Build for deployment Docker images
 	${OPTS} go build ${BUILD_OPTS_DEPLOY} -o /release/apps/skysocks ./cmd/apps/skysocks
 	${OPTS} go build ${BUILD_OPTS_DEPLOY} -o /release/apps/skysocks-client ./cmd/apps/skysocks-client
 
-github-release: sysroot
+github-release:
 	goreleaser --rm-dist
 
 build-docker: ## Build docker image
@@ -178,5 +177,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"
@@ -13,6 +14,7 @@ import (
 	"github.com/skycoin/skycoin/src/util/logging"
 	"github.com/spf13/cobra"
 
+	"github.com/skycoin/skywire/pkg/skyenv"
 	"github.com/skycoin/skywire/pkg/visor/visorconfig"
 )
 
@@ -62,12 +64,15 @@ var genConfigCmd = &cobra.Command{
 
 		//set output for package and skybian configs
 		if packageConfig {
-			if hypervisor {
-				output = "/opt/skywire/skywire.json"
+			var configName string
+			if runtime.GOOS == "linux" {
+				configName = "skywire-visor.json"
 			} else {
-				output = "/opt/skywire/skywire-visor.json"
+				configName = "skywire-config.json"
 			}
+			output = filepath.Join(skyenv.PackageSkywirePath(), configName)
 		}
+
 		if skybianConfig {
 			output = "/etc/skywire-config.json"
 		}

cmd/skywire-visor/commands/root.go

@@ -11,7 +11,7 @@ import (
 	_ "net/http/pprof" // nolint:gosec // https://golang.org/doc/diagnostics.html#profiling
 	"os"
 	"os/exec"
-	"runtime"
+	"path/filepath"
 	"strings"
 	"sync"
 	"syscall"
@@ -25,6 +25,7 @@ import (
 	"github.com/toqueteos/webbrowser"
 
 	"github.com/skycoin/skywire/pkg/restart"
+	"github.com/skycoin/skywire/pkg/skyenv"
 	"github.com/skycoin/skywire/pkg/syslog"
 	"github.com/skycoin/skywire/pkg/visor"
 	"github.com/skycoin/skywire/pkg/visor/logstore"
@@ -50,6 +51,8 @@ var (
 	launchBrowser bool
 	stopVisorFn   func() // nolint:unused
 	stopVisorWg   sync.WaitGroup
+	vis           *visor.Visor
+	visAssignChan chan bool
 )
 
 var rootCmd = &cobra.Command{
@@ -73,6 +76,8 @@ func init() {
 }
 
 func runVisor(args []string) {
+	var ok bool
+	visAssignChan = make(chan bool, 1)
 	log := initLogger(tag, syslogAddr)
 	store, hook := logstore.MakeStore(runtimeLogMaxEntries)
 	log.AddHook(hook)
@@ -128,29 +133,26 @@ func runVisor(args []string) {
 
 	conf := initConfig(log, args, confPath)
 
-	v, ok := visor.NewVisor(conf, restartCtx)
+	vis, ok = visor.NewVisor(conf, restartCtx)
 	if !ok {
 		log.Errorln("Failed to start visor.")
 		quitSystray()
 		return
 	}
-	v.SetLogstore(store)
+	visAssignChan <- ok
+	vis.SetLogstore(store)
 
 	if launchBrowser {
 		runBrowser(conf, log)
 	}
 
 	ctx, cancel := cmdutil.SignalContext(context.Background(), log)
-	setStopFunction(log, cancel, v.Close)
-
-	defer cancel()
+	setStopFunction(log, cancel, vis.Close)
 
 	// Wait.
 	<-ctx.Done()
 
-	if err = v.Close(); err != nil {
-		log.Error("Error closing visor: ", err)
-	}
+	stopVisorFn()
 }
 
 // Execute executes root CLI command.
@@ -238,11 +240,7 @@ func initConfig(mLog *logging.MasterLogger, args []string, confPath string) *vis
 		}
 
 		if confPath == "" {
-			if runtime.GOOS == "darwin" {
-				confPath = os.Getenv("HOME") + "/Skywire/" + defaultConfigName
-			} else {
-				confPath = "/opt/skywire/" + defaultConfigName
-			}
+			confPath = filepath.Join(skyenv.PackageSkywirePath(), defaultConfigName)
 		}
 
 		fallthrough

cmd/skywire-visor/commands/systray.go

@@ -34,20 +34,26 @@ func runApp(args ...string) {
 
 	conf := initConfig(l, args, confPath)
 
-	systray.Run(gui.GetOnGUIReady(sysTrayIcon, conf), gui.OnGUIQuit)
+	<-visAssignChan
+
+	systray.Run(gui.GetOnGUIReady(sysTrayIcon, conf, vis), gui.OnGUIQuit)
 
 }
 
-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/mac_install.md

@@ -0,0 +1,31 @@
+# MacOS
+
+## Installation
+
+### Developer
+
+Prequisites:
+
+- Xcode
+- MacOS Host
+
+Run `make mac-installer` on the root of the `skywire` directory
+
+It should output two installer for `amd64 (Intel Mac)` and `arm64 (M1 Macs)` so install one that depends on your CPU
+arch / ISA.
+
+### End User
+
+- Download the pkg / dmg for your machine, depends on your CPU arch / ISA.
+- Install it.
+
+## Running
+
+### Directory Layout
+
+- Skywire's config directory as well as other binaries is in `/Users/${USER}/Library/Application\ Support/Skywire`
+- Runtime logs is in `/Users/${USER}/Library/Logs/Skywire/visor.log`
+
+## Updating
+
+Same as Installation, choose the `Update` option.

docs/systray-builds.md

@@ -60,7 +60,7 @@ $ gnome-extensions enable ubuntu-appindicators@ubuntu.com
 
 #### 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,10 +43,10 @@ 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/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
+	golang.org/x/text v0.3.6 // indirect
 	golang.org/x/tools v0.1.2 // indirect
 	golang.zx2c4.com/wireguard v0.0.20200320
 	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect

go.sum

@@ -402,8 +402,6 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a h1:kr2P4QFmQr29mSLA43kwrOcgcReGTfbE9N577tCTuBc=
 golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d h1:RNPAfi2nHY7C2srAV8A49jpsYr0ADedCk1wq6fTMTvs=
-golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
 golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=