update install script, config, bower.json

This commit is contained in:
Matthew Scragg 2014-09-08 16:05:23 -05:00
parent 6459d6b842
commit b4a74342e3
3 changed files with 24 additions and 16 deletions

View file

@ -44,9 +44,12 @@ LOGIN_DISABLED = ALLOW_ANON
ROOT_ENDPOINT = 'wiki.page'
with open(os.path.join(APP_PATH, 'config.json')) as f:
__settings = json.load(f)
globals().update(__settings)
try:
with open(os.path.join(APP_PATH, 'config.json')) as f:
__settings = json.load(f)
globals().update(__settings)
except IOError:
pass
if BASE_URL.endswith('/'):
BASE_URL = BASE_URL[-1]