[pkg] use the version string from the systray

Makefile

-SYSTRAY := 0xacab.org/leap/bitmask-systray.git
+SYSTRAY := 0xacab.org/leap/bitmask-systray
 STAGING := staging
 SYSTRAY_BIN := bitmask-systray
 HELPER_BIN := bitmask_helper
 APP_NAME := RiseupVPN
 BUILD_RELEASE?=no
 OSX_CERT = "Developer ID Installer: LEAP Encryption Access Project"
-VERSION = $(shell cat version)
+VERSION = $(shell git -C `go env GOPATH`/src/$(SYSTRAY)  describe --tags)
 
 # -----------------------------------------------------------------------------
 # Windows 
@@ -51,11 +51,11 @@ helper_osx:
 	upx $(STAGING)/$(HELPER_BIN)
 systray_osx:
 	go get -tags "standalone" -u $(SYSTRAY)
-	go build -tags "standalone" -o $(STAGING)/$(SYSTRAY_BIN) $(SYSTRAY)
+	go build -tags "standalone" -ldflags "-X main.version=$(VERSION)" -o $(STAGING)/$(SYSTRAY_BIN) $(SYSTRAY)
 	upx $(STAGING)/$(SYSTRAY_BIN)
 bundle_osx:
 	mkdir -p dist
-	make -C osx
+	make -C osx VERSION=$(VERSION)
 pkg_osx:
 	osx/quickpkg --output dist/$(APP_NAME)-$(VERSION)_unsigned.pkg --scripts osx/scripts/ dist/$(APP_NAME).app/
 	@if [ $(BUILD_RELEASE) = no ]; then\

osx/Makefile

 generate:
-	python ./generate.py
+	python ./generate.py $(VERSION)

osx/generate.py

@@ -30,7 +30,7 @@ TEMPLATE_HELPER = 'template-helper.plist'
 TEMPLATE_PREINSTALL = 'template-preinstall'
 TEMPLATE_POSTINSTALL = 'template-postinstall'
 
-VERSION = open(os.path.join(here, '..', 'version')).read().strip()
+VERSION = sys.argv[1]
 
 APP_PATH = os.path.abspath(here + '/../dist/' + APP_NAME + ".app")
 STAGING = os.path.abspath(here + '/../staging/')

version

-0.11