Merge branch 'develop' into feature/systray-menu

Conflicts:
	src/leap/app.py

2 files changed, 26 insertions, 0 deletions

diff --git a/pkg/branding/__init__.py b/pkg/branding/__init__.py
new file mode 100644
index 00000000..0bd6befb
--- /dev/null
+++ b/pkg/branding/__init__.py
@@ -0,0 +1,15 @@
+from .config import APP_BASE_NAME, APP_PREFIX, BRANDED_BUILD, BRANDED_OPTS
+
+
+def get_name():
+    if BRANDED_BUILD is True:
+        return APP_PREFIX + BRANDED_OPTS.get('short_name', 'name_unknown')
+    else:
+        return APP_BASE_NAME
+
+
+def get_shortname():
+    if BRANDED_BUILD is True:
+        return BRANDED_OPTS.get('short_name', 'name_unknown')
+
+__all__ = ['get_name']
diff --git a/pkg/branding/config.py b/pkg/branding/config.py
new file mode 100644
index 00000000..665cfbda
--- /dev/null
+++ b/pkg/branding/config.py
@@ -0,0 +1,11 @@
+# Configuration file for branding
+
+BRANDED_BUILD = True
+
+APP_BASE_NAME = "leap-client"
+APP_PREFIX = "%s-" % APP_BASE_NAME
+
+BRANDED_OPTS = {
+    'short_name': "springbok",
+    'provider_domain': "springbok",
+    'provider_ca_path': "data/branding/cacert.pem"}