Fix app launch (#1778)

* don't user working dir to determine bin path

* adjust bin path in skyenv

* update Makefile

* small fix

* make format

* change default bin path from ./apps to ./build

* remove unneeded app launcher scripts

* fix make run-source

* change cmd/skywire-deployment to cmd/skywire

* fix makefile on windows

Makefile

@@ -118,28 +118,17 @@ check-cg: ## Cursory check of the main help menu, offline dmsghttp config gen an
 
 check-windows: lint-windows test-windows ## Run linters and tests on windows image
 
-build: host-apps bin ## Install dependencies, build apps and binaries. `go build` with ${OPTS}
+build: build-merged ## Install dependencies, build apps and binaries. `go build` with ${OPTS}
 
 build-merged: ## Install dependencies, build apps and binaries. `go build` with ${OPTS}
 	${OPTS} go build ${BUILD_OPTS} -o $(BUILD_PATH)skywire ./cmd/skywire
 
 build-merged-windows: clean-windows
 	powershell '${OPTS} go build ${BUILD_OPTS} -o $(BUILD_PATH)skywire.exe ./cmd/skywire'
 
-build-windows: host-apps-windows bin-windows ## Install dependencies, build apps and binaries. `go build` with ${OPTS}
-
-build-static: host-apps-static bin-static ## Build apps and binaries. `go build` with ${OPTS}
-
-build-static-wos: host-apps-static bin-static-wos ## Build apps and binaries. `go build` with ${OPTS}
-
-build-example: host-apps example-apps bin ## Build apps, example apps and binaries. `go build` with ${OPTS}
-
-installer: mac-installer ## Builds MacOS installer for skywire-visor
-
 install-system-linux: build ## Install apps and binaries over those provided by the linux package - linux package must be installed first!
 	sudo echo "sudo cache"
-	sudo install -Dm755 $(BUILD_PATH){skywire-cli,skywire-visor} /opt/skywire/bin/ & \
-	sudo install -Dm755 $(BUILD_PATH)apps/{vpn-server,vpn-client,skysocks-client,skysocks,skychat} /opt/skywire/apps/
+	sudo install -Dm755 $(BUILD_PATH)skywire /opt/skywire/bin/
 
 install-system-linux-merged: build-merged ## Install apps and binaries over those provided by the linux package - linux package must be installed first!
 	sudo echo "sudo cache"
@@ -159,13 +148,13 @@ clean-windows: ## Clean project: remove created binaries and apps
 	powershell -Command "If (Test-Path ./build) { Remove-Item -Path ./build -Force -Recurse }"
 
 install: ## Install `skywire-visor`, `skywire-cli`, `setup-node`
-	${OPTS} go install ${BUILD_OPTS} ./cmd/skywire-visor ./cmd/skywire-cli ./cmd/setup-node
+	${OPTS} go install ${BUILD_OPTS} ./cmd/skywire
 
 install-windows: ## Install `skywire-visor`, `skywire-cli`, `setup-node`
 	powershell 'Get-ChildItem .\cmd | % { ${OPTS} go install ${BUILD_OPTS} ./ $$_.FullName }'
 
 install-static: ## Install `skywire-visor`, `skywire-cli`, `setup-node`
-	${STATIC_OPTS} go install -trimpath --ldflags '-linkmode external -extldflags "-static" -buildid=' ./cmd/skywire-visor ./cmd/skywire-cli ./cmd/setup-node
+	${STATIC_OPTS} go install -trimpath --ldflags '-linkmode external -extldflags "-static" -buildid=' ./cmd/skywire
 
 lint: ## Run linters. Use make install-linters first
 	golangci-lint --version
@@ -185,7 +174,7 @@ test: ## Run tests
 
 test-windows: ## Run tests on windows
 	@go clean -testcache
-	${OPTS} go test ${TEST_OPTS} ./internal/... ./pkg/... ./cmd/skywire-cli... ./cmd/skywire-visor... ./cmd/apps...
+	${OPTS} go test ${TEST_OPTS} ./internal/... ./pkg/... ./cmd/skywire-cli... ./cmd/skywire-visor... ./cmd/skywire... ./cmd/apps...
 
 install-linters: ## Install linters
 	- VERSION=latest ./ci_scripts/install-golangci-lint.sh
@@ -216,39 +205,14 @@ snapshot-linux: ## 	goreleaser --snapshot --config .goreleaser-linux.yml --skip-
 snapshot-clean: ## Cleans snapshot / release
 	rm -rf ./dist
 
-host-apps: ## Build app
-	test -d $(BUILD_PATH) && rm -r $(BUILD_PATH) || true
-	mkdir -p $(BUILD_PATH)apps
-	${OPTS} go build ${BUILD_OPTS} -o $(BUILD_PATH)apps/ ./cmd/apps/...
-
 example-apps: ## Build example apps
 	${OPTS} go build ${BUILD_OPTS} -o $(BUILD_PATH)apps/ ./example/...
 
-host-apps-windows: ## build apps on windows
-	powershell -Command new-item $(BUILD_PATH)apps -itemtype directory -force
-	powershell 'Get-ChildItem .\cmd\apps | % { ${OPTS} go build ${BUILD_OPTS} -o $(BUILD_PATH)apps $$_.FullName }'
-
-# Static Apps
-host-apps-static: ## Build app
-	test -d apps && rm -r apps || true
-	mkdir -p ./apps
-	${STATIC_OPTS} go build -trimpath --ldflags '-linkmode external -extldflags "-static" -buildid=' -o $(BUILD_PATH)apps/ ./cmd/apps/...
-
-host-apps-deploy: ## Build app
-	test -d apps && rm -r apps || true
-	mkdir -p ./apps
-	${OPTS} go build ${BUILD_OPTS_DEPLOY} -o $(BUILD_PATH)apps/ ./cmd/apps/...
-
-host-apps-race: ## Build app
-	test -d apps && rm -r apps || true
-	mkdir -p ./apps
-	CGO_ENABLED=1${OPTS} go build ${BUILD_OPTS} -race -o $(BUILD_PATH)apps/ ./cmd/apps/...
-
 # Bin
 bin: fix-systray-vendor bin-fix unfix-systray-vendor
 
-bin-fix: ## Build `skywire-visor`, `skywire-cli`
-	${OPTS} go build ${BUILD_OPTS} -o $(BUILD_PATH) ./cmd/skywire-visor ./cmd/skywire-cli ./cmd/setup-node ./cmd/skywire
+bin-fix: ## Build `skywire`
+	${OPTS} go build ${BUILD_OPTS} -o $(BUILD_PATH) ./cmd/skywire
 
 fix-systray-vendor:
 	@if [ $(UNAME_S) = "Linux" ]; then\
@@ -260,25 +224,22 @@ unfix-systray-vendor:
 		sed -i '/conn.handleCall(msg)/c\			go conn.handleCall(msg)' ./vendor/github.com/godbus/dbus/v5/conn.go ;\
 	fi
 
-bin-windows: ## Build `skywire-visor`, `skywire-cli`
-	powershell 'Get-ChildItem .\cmd | % { ${OPTS} go build ${BUILD_OPTS} -o $(BUILD_PATH) $$_.FullName }'
+build-windows: ## Build `skywire-visor`
+	powershell '${OPTS} go build ${BUILD_OPTS} -o $(BUILD_PATH) ./cmd/skywire'
 
 # Static Bin
-bin-static: ## Build `skywire-visor`, `skywire-cli`
-	${STATIC_OPTS} go build 8 -trimpath --ldflags '-linkmode external -extldflags "-static" -buildid=' -o $(BUILD_PATH) ./cmd/skywire-visor ./cmd/skywire-cli ./cmd/setup-node
+build-static: ## Build `skywire-visor`, `skywire-cli`
+	${STATIC_OPTS} go build 8 -trimpath --ldflags '-linkmode external -extldflags "-static" -buildid=' -o $(BUILD_PATH) ./cmd/skywire
 
 # Static Bin without Systray
-bin-static-wos: ## Build `skywire-visor`, `skywire-cli`
-	${STATIC_OPTS} go build -tags withoutsystray -trimpath --ldflags '-linkmode external -extldflags "-static" -buildid=' -o $(BUILD_PATH)skywire-visor ./cmd/skywire-visor
-	${STATIC_OPTS} go build -trimpath --ldflags '-linkmode external -extldflags "-static" -buildid=' -o $(BUILD_PATH)  ./cmd/skywire-cli ./cmd/setup-node
+build-static-wos: ## Build `skywire-visor`, `skywire-cli`
+	${STATIC_OPTS} go build -tags withoutsystray -trimpath --ldflags '-linkmode external -extldflags "-static" -buildid=' -o $(BUILD_PATH)skywire-visor ./cmd/skywire
 
-build-deploy: host-apps-deploy ## Build for deployment Docker images
-	${OPTS} go build -tags netgo ${BUILD_OPTS_DEPLOY} -o /release/skywire-visor ./cmd/skywire-visor
-	${OPTS} go build ${BUILD_OPTS_DEPLOY} -o /release/skywire-cli ./cmd/skywire-cli
+build-deploy: ## Build for deployment Docker images
+	${OPTS} go build -tags netgo ${BUILD_OPTS_DEPLOY} -o /release/skywire ./cmd/skywire
 
-build-race: host-apps-race ## Build for testing Docker images
-	CGO_ENABLED=1 ${OPTS} go build -tags netgo ${BUILD_OPTS} -race -o /release/skywire-visor ./cmd/skywire-visor
-	CGO_ENABLED=1 ${OPTS} go build ${BUILD_OPTS} -race -o /release/skywire-cli ./cmd/skywire-cli
+build-race: ## Build for testing Docker images
+	CGO_ENABLED=1 ${OPTS} go build -tags netgo ${BUILD_OPTS} -race -o /release/skywire ./cmd/skywire
 
 github-prepare-release:
 	$(eval GITHUB_TAG=$(shell git describe --abbrev=0 --tags | cut -c 2-6))
@@ -287,9 +248,6 @@ github-prepare-release:
 github-release: github-prepare-release
 	goreleaser --rm-dist --config .goreleaser-linux.yml --release-notes releaseChangelog.md
 
-github-release-archlinux: github-prepare-release
-	goreleaser --rm-dist --config .goreleaser-archlinux.yml --release-notes releaseChangelog.md
-
 github-release-darwin:
 	goreleaser --rm-dist  --config .goreleaser-darwin.yml --skip-publish
 	$(eval GITHUB_TAG=$(shell git describe --abbrev=0 --tags))
@@ -337,59 +295,27 @@ run: ## Run skywire visor with skywire-config.json, and start a browser if runni
 ## Prepare to run skywire from source, without compiling binaries
 prepare:
 	test -d apps && rm -r apps || true
-	mkdir -p apps
-	ln ./scripts/_apps/skychat ./apps/
-	ln ./scripts/_apps/skysocks ./apps/
-	ln ./scripts/_apps/skysocks-client ./apps/
-	ln ./scripts/_apps/vpn-server ./apps/
-	ln ./scripts/_apps/vpn-client ./apps/
-	chmod +x ./apps/*
+	test -d build && rm -r build || true
+	mkdir -p build || true
+	ln ./scripts/skywire ./build/
+	chmod +x ./build/*
 	sudo echo "sudo cache"
 
-## Prepare to run skywire from source via cmd/skywire-deployment, without compiling binaries
-prepare1:
-	test -d apps && rm -r apps || true
-	mkdir -p apps
-	ln ./scripts/_merged-apps/skychat ./apps/
-	ln ./scripts/_merged-apps/skysocks ./apps/
-	ln ./scripts/_merged-apps/skysocks-client ./apps/
-	ln ./scripts/_merged-apps/vpn-server ./apps/
-	ln ./scripts/_merged-apps/vpn-client ./apps/
-	chmod +x ./apps/*
-	sudo echo "sudo cache"
 
 run-source: prepare ## Run skywire from source, without compiling binaries
-	go run ./cmd/skywire-cli/skywire-cli.go config gen -in | sudo go run ./cmd/skywire-visor/skywire-visor.go -n || true
-
-run-source-merged: prepare1 ## Run skywire from source, without compiling binaries
 	go run ./cmd/skywire/skywire.go cli config gen -in | sudo go run ./cmd/skywire/skywire.go visor -n || true
 
 run-systray: prepare ## Run skywire from source, with vpn server enabled
-	go run ./cmd/skywire-cli/skywire-cli.go config gen -ni | sudo go run ./cmd/skywire-visor/skywire-visor.go -n --systray || true
+	go run ./cmd/skywire/skywire.go cli config gen -ni | sudo go run ./cmd/skywire/skywire.go visor -n --systray || true
 
 run-vpnsrv: prepare ## Run skywire from source, without compiling binaries
-	go run ./cmd/skywire-cli/skywire-cli.go config gen -in --servevpn | sudo go run ./cmd/skywire-visor/skywire-visor.go -n || true
-
-run-source-test: prepare ## Run skywire from source with test endpoints
-	go run ./cmd/skywire-cli/skywire-cli.go config gen -nit | sudo go run ./cmd/skywire-visor/skywire-visor.go -n || true
-
-run-vpnsrv-test: prepare ## Run skywire from source, with vpn server enabled
-	go run ./cmd/skywire-cli/skywire-cli.go config gen -nit --servevpn | sudo go run ./cmd/skywire-visor/skywire-visor.go -n || true
-
-run-systray-test: prepare ## Run skywire from source, with vpn server enabled
-	go run ./cmd/skywire-cli/skywire-cli.go config gen -nit | sudo go run ./cmd/skywire-visor/skywire-visor.go --systray -n || true
+	go run ./cmd/skywire/skywire.go cli config gen -in --servevpn | sudo go run ./cmd/skywire/skywire.go visor -n || true
 
 run-source-dmsghttp: prepare ## Run skywire from source with dmsghttp config
-	go run ./cmd/skywire-cli/skywire-cli.go config gen -din | sudo go run ./cmd/skywire-visor/skywire-visor.go -n || true
+	go run ./cmd/skywire/skywire.go cli config gen -din | sudo go run ./cmd/skywire/skywire.go visor -n || true
 
 run-vpnsrv-dmsghttp: prepare ## Run skywire from source with dmsghttp config and vpn server
-	go run ./cmd/skywire-cli/skywire-cli.go config gen -din --servevpn | sudo go run ./cmd/skywire-visor/skywire-visor.go -n || true
-
-run-source-dmsghttp-test: prepare ## Run skywire from source with dmsghttp config and test endpoints
-	go run ./cmd/skywire-cli/skywire-cli.go config gen -dint | sudo go run ./cmd/skywire-visor/skywire-visor.go -n || true
-
-run-vpnsrv-dmsghttp-test: prepare ## Run skywire from source with dmsghttp config, vpn server, and test endpoints
-	go run ./cmd/skywire-cli/skywire-cli.go config gen -dint --servevpn | sudo go run ./cmd/skywire-visor/skywire-visor.go -n || true
+	go run ./cmd/skywire/skywire.go cli config gen -din --servevpn | sudo go run ./cmd/skywire/skywire.go visor -n || true
 
 lint-ui:  ## Lint the UI code
 	cd $(MANAGER_UI_DIR) && npm run lint
@@ -407,6 +333,8 @@ build-ui-windows: install-deps-ui ## Builds the UI on windows
 	powershell 'New-Item -Path ${MANAGER_UI_BUILT_DIR} -ItemType Directory'
 	powershell 'Copy-Item -Recurse ${MANAGER_UI_DIR}\dist\* ${MANAGER_UI_BUILT_DIR}'
 
+installer: mac-installer ## Builds MacOS installer for skywire-visor
+
 mac-installer: ## Create unsigned and not-notarized application, run make mac-installer-help for more
 	./scripts/mac_installer/create_installer.sh
 

go.mod

@@ -133,7 +133,6 @@ require (
 	github.com/rivo/uniseg v0.4.4 // indirect
 	github.com/rs/cors v1.8.2 // indirect
 	github.com/skycoin/noise v0.0.0-20180327030543-2492fe189ae6 // indirect
-	github.com/skycoin/skywire-ut v0.0.0-20240316145729-abfe9e406f95 // indirect
 	github.com/stretchr/objx v0.5.1 // indirect
 	github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161 // indirect
 	github.com/templexxx/xor v0.0.0-20191217153810-f85b25db303b // indirect

go.sum

@@ -434,8 +434,6 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd
 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/skycoin/dmsg v1.3.18-0.20240226072009-86c43e8d4ca4 h1:sWspjJ1xySLaEOV2I1IZz3vyx3Fxs5fnxegR3u0mH3k=
-github.com/skycoin/dmsg v1.3.18-0.20240226072009-86c43e8d4ca4/go.mod h1:INEDx+ECwCGQWw/Kd0QcLmSWMhbeRRcfkxj+xATQGFg=
 github.com/skycoin/dmsg v1.3.18-0.20240311074627-0ba753f65a88 h1:pXN98DxD24MjEMvFnZ/snR0KqiRzwz35A9UdzJ+Bkis=
 github.com/skycoin/dmsg v1.3.18-0.20240311074627-0ba753f65a88/go.mod h1:INEDx+ECwCGQWw/Kd0QcLmSWMhbeRRcfkxj+xATQGFg=
 github.com/skycoin/noise v0.0.0-20180327030543-2492fe189ae6 h1:1Nc5EBY6pjfw1kwW0duwyG+7WliWz5u9kgk1h5MnLuA=
@@ -444,14 +442,8 @@ github.com/skycoin/skycoin v0.27.1 h1:HatxsRwVSPaV4qxH6290xPBmkH/HgiuAoY2qC+e8C9
 github.com/skycoin/skycoin v0.27.1/go.mod h1:78nHjQzd8KG0jJJVL/j0xMmrihXi70ti63fh8vXScJw=
 github.com/skycoin/skycoin-service-discovery v0.0.0-20240306165129-2af10aca698e h1:y9C5pGHQp/iJFj0QJqr5SboE+Q2RmeYav/AncHOAmWg=
 github.com/skycoin/skycoin-service-discovery v0.0.0-20240306165129-2af10aca698e/go.mod h1:h2Yq97wrppNdVgtAhEhY/9w568wS3T6CkK2pWhfUQm0=
-github.com/skycoin/skywire-services v0.0.0-20240306165304-177c854f4aec h1:yhD4TOt+5w65we9KPo9N766aWmvxnGQtnD+Dp5k2dsE=
-github.com/skycoin/skywire-services v0.0.0-20240306165304-177c854f4aec/go.mod h1:wtdETGZ3hm1DBYEQ/3t5b1apF4mw3heWTZiOisSgIsE=
-github.com/skycoin/skywire-services v0.0.0-20240316160900-0498a9053d6b h1:HhR53PD9o16fpOjegLgh05Ve+4tutLBiEzvIk1afU+o=
-github.com/skycoin/skywire-services v0.0.0-20240316160900-0498a9053d6b/go.mod h1:wtdETGZ3hm1DBYEQ/3t5b1apF4mw3heWTZiOisSgIsE=
 github.com/skycoin/skywire-services v0.0.0-20240316183902-caaa6f3db525 h1:E6rHwv91yXloEiqyV1kET+lf7GvCVsReW7EqBNeD9hE=
 github.com/skycoin/skywire-services v0.0.0-20240316183902-caaa6f3db525/go.mod h1:wtdETGZ3hm1DBYEQ/3t5b1apF4mw3heWTZiOisSgIsE=
-github.com/skycoin/skywire-ut v0.0.0-20240316145729-abfe9e406f95 h1:4S//aHVTTiSeE6Ig2adEa75O+YkWSdMbBcAmdI5DnMI=
-github.com/skycoin/skywire-ut v0.0.0-20240316145729-abfe9e406f95/go.mod h1:rL48Kq3Zh//41xzKQpUgrP+KiS8WX3DGXRkdVHjE+FI=
 github.com/skycoin/skywire-utilities v1.3.18-0.20240208220612-9f31eda72f33 h1:BzhyKolEWT8cnXZJMxC0TYGCvu3wMYdI6NOpvToN+uQ=
 github.com/skycoin/skywire-utilities v1.3.18-0.20240208220612-9f31eda72f33/go.mod h1:yFKWpL1bDRPKU3uK+cTF4PnYUMe+eyIj5N2bk4sF5Cw=
 github.com/skycoin/systray v1.10.0 h1:fQZJHMylpVvfmOOTLvUssfyHVDoC8Idx6Ba2BlLEuGg=

pkg/app/launcher/launcher.go

@@ -293,10 +293,6 @@ func (l *AppLauncher) RestartApp(name, binary string) error {
 }
 
 func makeProcConfig(lc AppLauncherConfig, ac appserver.AppConfig, envs []string) (appcommon.ProcConfig, error) {
-	binPath := lc.BinPath
-	if ac.Binary == "skywire" {
-		binPath, _ = os.Getwd() //nolint
-	}
 
 	procConf := appcommon.ProcConfig{
 		AppName:     ac.Name,
@@ -307,7 +303,7 @@ func makeProcConfig(lc AppLauncherConfig, ac appserver.AppConfig, envs []string)
 		ProcWorkDir: filepath.Join(lc.LocalPath, ac.Name),
 		VisorPK:     lc.VisorPK,
 		RoutingPort: ac.Port,
-		BinaryLoc:   filepath.Join(binPath, ac.Binary),
+		BinaryLoc:   filepath.Join(lc.BinPath, ac.Binary),
 		LogDBLoc:    filepath.Join(lc.LocalPath, ac.Name+"_log.db"),
 	}
 	err := ensureDir(&procConf.ProcWorkDir)

pkg/skyenv/skyenv.go

@@ -80,7 +80,7 @@ const (
 
 	AppSrvAddr                = "localhost:5505" // AppSrvAddr ...
 	ServiceDiscUpdateInterval = time.Minute      // ServiceDiscUpdateInterval ...
-	AppBinPath                = "./apps"         // AppBinPath ...
+	AppBinPath                = "./build"        // AppBinPath ...
 	LogLevel                  = "info"           // LogLevel ...
 
 	// Routing constants

pkg/skyenv/skyenv_darwin.go

@@ -11,19 +11,12 @@ const (
 	SkywirePath = "/Library/Application Support/Skywire"
 	// ConfigJSON is the config name generated by the script included with the installation on mac
 	ConfigJSON = "skywire-config.json"
-
-	//TODO: @mrpalide set this correctly for macos. it shouldn't be in the installed path
-
-	// SkyenvFilePath is the path to the SkyenvFile
-	SkyenvFilePath = "/Library/Application Support/Skywire"
-	// SkyenvFile contains environmental variables which are detected by `skywire-autoconfig` / `skywire-cli config auto` to set default or persistent values
-	SkyenvFile = "skyenv.sh"
 )
 
 // PackageConfig contains installation paths (for mac)
 func PackageConfig() PkgConfig {
 	pkgConfig := PkgConfig{
-		LauncherBinPath: "/Applications/Skywire.app/Contents/MacOS/apps",
+		LauncherBinPath: "/Applications/Skywire.app/Contents/MacOS/bin", //apps are now subcommands of the skywire binary "/Applications/Skywire.app/Contents/MacOS/apps",
 		LocalPath:       "/Library/Application Support/Skywire/local",
 		Hypervisor: Hypervisor{
 			DbPath:     "/Library/Application Support/Skywire/users.db",

pkg/skyenv/skyenv_linux.go

@@ -16,7 +16,7 @@ const (
 // PackageConfig contains installation paths (for linux)
 func PackageConfig() PkgConfig {
 	pkgConfig := PkgConfig{
-		LauncherBinPath: "/opt/skywire/apps",
+		LauncherBinPath: "/opt/skywire/bin", //apps are now subcommands of the skywire binary "/opt/skywire/apps",
 		LocalPath:       "/opt/skywire/local",
 		Hypervisor: Hypervisor{
 			DbPath:     "/opt/skywire/users.db",

pkg/skyenv/skyenv_windows.go

@@ -11,19 +11,12 @@ const (
 	SkywirePath = "C:/Program Files/Skywire"
 	// ConfigJSON is the config name generated by the batch file included with the windows .msi
 	ConfigJSON = "skywire-config.json"
-
-	//TODO: @mrpalide set this correctly for windows. it shouldn't be in the installed path
-
-	// SkyenvFilePath is the path to the SkyenvFile
-	SkyenvFilePath = "C:/Program Files/Skywire"
-	// SkyenvFile contains environmental variables which are detected by `skywire-autoconfig` / `skywire-cli config auto` to set default or persistent values
-	SkyenvFile = "skyenv.bat"
 )
 
 // PackageConfig contains installation paths (for windows)
 func PackageConfig() PkgConfig {
 	pkgConfig := PkgConfig{
-		LauncherBinPath: "C:/Program Files/Skywire/apps",
+		LauncherBinPath: "C:/Program Files/Skywire/bin", //apps are now subcommands of the skywire binary "C:/Program Files/Skywire/apps",
 		LocalPath:       "C:/Program Files/Skywire/local",
 		Hypervisor: Hypervisor{
 			DbPath:     "C:/Program Files/Skywire/users.db",

scripts/skywire

@@ -0,0 +1,2 @@
+#!/bin/bash
+go run ../../cmd/skywire/skywire.go $@