From 451f6fef9d707e121cd3d14b3114f7be4e3b2444 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Tue, 30 Nov 2021 13:51:46 +0100
Subject: [PATCH] [pkg] fix makefile, installer
---
Makefile | 4 ++--
branding/scripts/gen-qtinstaller | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 3f42739b..263df1a3 100644
--- a/Makefile
+++ b/Makefile
@@ -206,10 +206,10 @@ ifeq (${PLATFORM}, darwin)
@cp build/bin/${PLATFORM}/bitmask-helper ${INST_DATA}/
ifeq (${RELEASE}, yes)
@echo "[+] Running macdeployqt (release mode)"
- @macdeployqt ${QTBUILD}/release/${PROVIDER}-vpn.app -qmldir=gui/qml ${MACDEPLOYQT_OPTS}
+ @macdeployqt ${QTBUILD}/release/${PROVIDER}-vpn.app -qmldir=gui/components ${MACDEPLOYQT_OPTS}
else
@echo "[+] Running macdeployqt (debug mode)"
- @macdeployqt ${QTBUILD}/release/${PROVIDER}-vpn.app -qmldir=gui/qml
+ @macdeployqt ${QTBUILD}/release/${PROVIDER}-vpn.app -qmldir=gui/components
endif
@cp -r "${QTBUILD}/release/${TARGET}.app"/ ${INST_DATA}/
endif
diff --git a/branding/scripts/gen-qtinstaller b/branding/scripts/gen-qtinstaller
index 9be097d6..5b4d103d 100755
--- a/branding/scripts/gen-qtinstaller
+++ b/branding/scripts/gen-qtinstaller
@@ -8,7 +8,7 @@ import time
from string import Template
-from provider import getDefaultProvider
+from provider import getDefaultProviders
from provider import getProviderData
OS_CONFIG = {
@@ -46,7 +46,7 @@ def getData():
provider = os.environ.get('PROVIDER')
if not provider:
- provider = getDefaultProvider(config)
+ provider = getDefaultProviders(config)[0]
return getProviderData(provider, config)
def generateQtInstallerBoilerplate(data, platform, outDir):
--
GitLab