diff options
| author | kali <kali@leap.se> | 2021-11-30 13:51:46 +0100 |
|---|---|---|
| committer | kali kaneko (leap communications) <kali@leap.se> | 2021-11-30 13:54:01 +0100 |
| commit | 451f6fef9d707e121cd3d14b3114f7be4e3b2444 (patch) | |
| tree | 4103ca7f1dfd1b178a14d808484b9535c744f991 | |
| parent | e5885ffb03107246e466967a97ca40c1d52e631d (diff) | |
[pkg] fix makefile, installer
| -rw-r--r-- | Makefile | 4 | ||||
| -rwxr-xr-x | branding/scripts/gen-qtinstaller | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -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 9be097d..5b4d103 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): |