From 75d723cf167136a18342402a9a6e82e51c13b700 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Tue, 21 Jul 2020 20:47:30 +0200
Subject: [PATCH] [bug] fix version reporting in helper
---
Makefile | 18 ++++++++++++------
pkg/helper/darwin.go | 2 ++
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index a62f2e20..f4ab19cd 100644
--- a/Makefile
+++ b/Makefile
@@ -54,11 +54,13 @@ dependsDarwin:
@brew install python3 golang make pkg-config curl
@brew install --default-names gnu-sed
-dependsCygwin:
- @choco install -y golang python nssm nsis wget 7zip
+build: build_helper
+ @gui/build.sh
-build:
- gui/build.sh
+build_helper:
+ @echo "PLATFORM: ${PLATFORM}"
+ @mkdir -p build/bin/${PLATFORM}
+ go build -o build/bin/${PLATFORM}/bitmask-helper -ldflags "-X main.AppName=${PROVIDER}VPN -X main.Version=${VERSION}" ./cmd/bitmask-helper/
build_old:
ifeq (${XBUILD}, yes)
@@ -76,8 +78,12 @@ else
endif
-helper:
- go build -ldflags "-X main.AppName=${PROVIDER}VPN -X main.Version=${VERSION}" cmd/bitmask-helper/main.go
+build_old_%:
+ @echo "PLATFORM: ${PLATFORM}"
+ @mkdir -p build/bin/${PLATFORM}
+ go build -tags $(TAGS) -ldflags "-s -w -X main.version=`git describe --tags` ${EXTRA_LDFLAGS}" -o build/bin/${PLATFORM}/$* ./cmd/$*
+ -@rm -rf build/${PROVIDER}/staging/${PLATFORM} && mkdir -p build/${PROVIDER}/staging/${PLATFORM}
+ -@ln -s ../../../bin/${PLATFORM}/$* build/${PROVIDER}/staging/${PLATFORM}/$*
test:
@go test -tags "integration $(TAGS)" ./pkg/...
diff --git a/pkg/helper/darwin.go b/pkg/helper/darwin.go
index e43c33ca..82becee1 100644
--- a/pkg/helper/darwin.go
+++ b/pkg/helper/darwin.go
@@ -65,6 +65,8 @@ func parseCliArgs() {
// OSX helper does not respond to arguments
}
+func initializeService(port int) {}
+
func daemonize() {
cntxt := &daemon.Context{
PidFileName: "pid",
--
GitLab