diff options
| author | kali <kali@leap.se> | 2020-10-13 19:24:11 +0200 |
|---|---|---|
| committer | kali kaneko (leap communications) <kali@leap.se> | 2020-10-23 23:21:56 +0200 |
| commit | 93a0668a02b3a280919c4881db9085d5f2a912af (patch) | |
| tree | 25145622bada4b4f6cb24c516b51677022c26d8f /branding/scripts | |
| parent | 163f14df408febb1fe92f4ddeffdfe933164b87f (diff) | |
[pkg] osx fixes for installer build
Diffstat (limited to 'branding/scripts')
| -rwxr-xr-x | branding/scripts/gen-qtinstaller | 5 | ||||
| -rw-r--r-- | branding/scripts/provider.py | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/branding/scripts/gen-qtinstaller b/branding/scripts/gen-qtinstaller index 58ab3f9..1f2c03d 100755 --- a/branding/scripts/gen-qtinstaller +++ b/branding/scripts/gen-qtinstaller @@ -35,11 +35,9 @@ OS_CONFIG = { """ } - - def getData(): config = configparser.ConfigParser() - configPath = os.path.join(here(), '../../branding/config/vendor.conf') + configPath = os.path.join(VENDOR_PATH, 'vendor.conf') config.read(configPath) provider = os.environ.get('PROVIDER') @@ -120,7 +118,6 @@ def getVersion(): return os.environ.get('VERSION', 'unknown') if __name__ == "__main__": - # TODO get from vendor - maybe just in provider module VENDOR_PATH = os.environ.get('VENDOR_PATH') if len(sys.argv) != 3: diff --git a/branding/scripts/provider.py b/branding/scripts/provider.py index 9f6bb08..8904c37 100644 --- a/branding/scripts/provider.py +++ b/branding/scripts/provider.py @@ -15,10 +15,12 @@ def getDefaultProvider(config): def getProviderData(provider, config): print("[+] Configured provider:", provider) - - c = config[provider] + try: + c = config[provider] + except Exception: + raise ValueError('Cannot find provider') + d = dict() - keys = ('name', 'applicationName', 'binaryName', 'auth', 'authEmptyPass', 'providerURL', 'tosURL', 'helpURL', 'askForDonations', 'donateURL', 'apiURL', |