colin/browserpass-native
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update placeholder (#10)

Browse Source 
* Put error message inside params
* Rename .response to .data
This commit is contained in:
Erayd
2018-04-14 21:39:02 +12:00
committed by GitHub
parent 72a0f239ad
commit 60a4a1ddaa
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
placeholder.sh
View File

@@ -14,7 +14,7 @@ function writelen()
function require() function require()
{ {
if ! `command -v "$1" >/dev/null`; then if ! `command -v "$1" >/dev/null`; then
OUTPUT="{\n \"status\": \"error\"\n "version": $VERSION,\n \"message\": \"Required dependency '$1' is missing\"\n \"code\": 1\n}" OUTPUT="{\n \"status\": \"error\"\n "version": $VERSION,\n \"params\": {\n \"message\": \"Required dependency '$1' is missing\"\n }, \"code\": 1\n}"
LANG=C LC_ALL=C LENGTH=${#OUTPUT} LANG=C LC_ALL=C LENGTH=${#OUTPUT}
echo -n echo -n
exit 1 exit 1
@@ -43,7 +43,7 @@ function error()
ERROR=$(cat) ERROR=$(cat)
fi fi
[ -n "$2" ] && CODE="$2" || CODE=1 [ -n "$2" ] && CODE="$2" || CODE=1
OUTPUT="$(jq -n '.status = "error"' | jq --arg message "$ERROR" --arg code "$CODE" '.message = $message | .code = ($code|tonumber)')" OUTPUT="$(jq -n '.status = "error"' | jq --arg message "$ERROR" --arg code "$CODE" '.params.message = $message | .code = ($code|tonumber)')"
perl -e "print pack('L', ${#OUTPUT})" perl -e "print pack('L', ${#OUTPUT})"
echo -n "$OUTPUT" echo -n "$OUTPUT"
} }
@@ -61,7 +61,7 @@ function wrap()
error "$@" $EXIT error "$@" $EXIT
fi fi
else else
OUTPUT="$(jq -n --arg version $VERSION --arg response "$STDOUT" '.status = "ok" | .version = $version | .response = ($response | if .[:1] == "{" then ( . | fromjson) else . end)')" OUTPUT="$(jq -n --arg version $VERSION --arg response "$STDOUT" '.status = "ok" | .version = $version | .data = ($response | if .[:1] == "{" then ( . | fromjson) else . end)')"
perl -e "print pack('L', ${#OUTPUT})" perl -e "print pack('L', ${#OUTPUT})"
echo -n "$OUTPUT" echo -n "$OUTPUT"
fi fi