[deb] fix building bitmask branded debian package

Makefile

@@ -108,7 +108,7 @@ PKGFILES = $(shell find pkg -type f -name '*.go')
 endif
 
 lib/%.a: $(PKGFILES)
-	@XBUILD=no CC=${CC} CXX=${CXX} MAKE=${MAKE} AR=${AR} LD=${LD} ./gui/build.sh --just-golib
+	@XBUILD=no CC=${CC} VENDOR_PATH=${VENDOR_PATH} CXX=${CXX} MAKE=${MAKE} AR=${AR} LD=${LD} ./gui/build.sh --just-golib
 
 # FIXME move platform detection above! no place to uname here, just use $PLATFORM
 #
@@ -375,7 +375,7 @@ endif
 	@cd build/${PROVIDER}/debian && python3 generate.py
 	@cd build/${PROVIDER}/debian && rm app.desktop-template changelog-template rules-template control-template generate.py data.json && chmod +x rules
 	@cd build/${PROVIDER}/debian && mv app.desktop ${TARGET}.desktop && mv app.install ${TARGET}.install && rm -f app.install-template && \
-		rm -rf source/include-binaries-template
+	rm -rf source/include-binaries-template
 endif
 
 gen_pkg_snap:

branding/templates/debian/rules-template

@@ -10,6 +10,10 @@ export DH_GOPKG = 0xacab.org/leap/bitmask-vpn
 export DH_GOLANG_EXCLUDES := vendor packages tools cmd/bitmask-helper cmd/bitmask-connect
 
 export PATH := $(shell qmake6 -query "QT_INSTALL_BINS"):$(PATH)
+
+export PROVIDER=${name}
+export VENDOR_PATH=providers
+
 #dh_golang doesn't do this for you
 
 ifeq ($(DEB_HOST_ARCH), i386)
@@ -33,6 +37,7 @@ APPNAME = ${binaryName}
 override_dh_auto_test:
 
 override_dh_auto_build:
+	make gen_providers_json
 	make build
 
 override_dh_install:

gui/build.sh

@@ -5,10 +5,10 @@ set -e
 # set -x
 # --------------------
 
-XBUILD=${XBUILD-no}
-LRELEASE=${LRELEASE-lrelease}
-VENDOR_PATH=${VENDOR_PATH-providers/riseup}
-APPNAME=${APPNAME-BitmaskVPN}
+XBUILD="${XBUILD:-no}"
+LRELEASE="${LRELEASE:-lrelease}"
+VENDOR_PATH="${VENDOR_PATH:-providers/riseup}"
+APPNAME="${APPNAME:-BitmaskVPN}"
 
 OSX_TARGET=12
 WIN64="win64"