github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Use python2 in functions/get_json_*

Browse Source 
On hosts where python3 is the system default python env, Dokku will silently fail to return the values of json keys.
This commit is contained in:
swg
2016-08-26 22:54:04 -04:00
committed by GitHub
parent a00a9219da
commit 8f9c003a9f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/common/functions
View File

@@ -1039,7 +1039,7 @@ get_json_value() {
local JSON_NODE="$1" local JSON_NODE="$1"
local JSON_NODE=${JSON_NODE//\./\"][\"} local JSON_NODE=${JSON_NODE//\./\"][\"}
local JSON_NODE="[\"${JSON_NODE}\"]" local JSON_NODE="[\"${JSON_NODE}\"]"
cat | python -c 'import json,sys;obj=json.load(sys.stdin);print json.dumps(obj'"${JSON_NODE}"').strip("\"")'; cat | python2 -c 'import json,sys;obj=json.load(sys.stdin);print json.dumps(obj'"${JSON_NODE}"').strip("\"")';
} }
get_json_keys() { get_json_keys() {
@@ -1049,9 +1049,9 @@ get_json_keys() {
local JSON_NODE=${JSON_NODE//\./\"][\"} local JSON_NODE=${JSON_NODE//\./\"][\"}
local JSON_NODE="[\"${JSON_NODE}\"]" local JSON_NODE="[\"${JSON_NODE}\"]"
if [[ "$JSON_NODE" == "[\"\"]" ]]; then if [[ "$JSON_NODE" == "[\"\"]" ]]; then
cat | python -c 'import json,sys;obj=json.load(sys.stdin);print " ".join(obj.keys())'; cat | python2 -c 'import json,sys;obj=json.load(sys.stdin);print " ".join(obj.keys())';
else else
cat | python -c 'import json,sys;obj=json.load(sys.stdin);print " ".join(obj'"${JSON_NODE}"'.keys())'; cat | python2 -c 'import json,sys;obj=json.load(sys.stdin);print " ".join(obj'"${JSON_NODE}"'.keys())';
fi fi
} }