Merge pull request #158 from compressed/dollar_sign

fix(discovery): handle discovery urls with $
This commit is contained in:
Sebastian Thiel
2016-12-16 11:02:57 +01:00
committed by GitHub

View File

@@ -179,11 +179,14 @@ help${agsuffix}:
target = target_dir + '/' + name + '-api.json' target = target_dir + '/' + name + '-api.json'
## assure the target never actually exists to force him to wget whenver we ask ! ## assure the target never actually exists to force him to wget whenver we ask !
fake_target = target + '-force' fake_target = target + '-force'
## Some service urls have $ in them. This may cause the console to treat them as env vars.
## To handle this properly, we need to escape the $.
url = info['discoveryRestUrl'].replace("$", "$$")
json_api_targets.append(fake_target) json_api_targets.append(fake_target)
%>\ %>\
${fake_target}: ${fake_target}:
@mkdir -p ${target_dir} @mkdir -p ${target_dir}
@-wget -nv ${info['discoveryRestUrl']} -O ${target} @-wget -nv '${url}' -O ${target}
% endfor % endfor
update-json: ${' '.join(json_api_targets)} update-json: ${' '.join(json_api_targets)}