Commit b6051006 authored by nanahira's avatar nanahira

fix jq -r

parent 1f56476f
...@@ -3,11 +3,11 @@ apiRoot=https://sapi.moecube.com:444 ...@@ -3,11 +3,11 @@ apiRoot=https://sapi.moecube.com:444
if [[ -z "$token" ]]; then if [[ -z "$token" ]]; then
loginInfo=$(curl -sL -X POST $apiRoot/accounts/signin -d account=$username -d password=$password) loginInfo=$(curl -sL -X POST $apiRoot/accounts/signin -d account=$username -d password=$password)
loginExitCode="$?" loginExitCode="$?"
loginErrorMessage=$(echo "$loginInfo" | jq '.message' | sed 's/"//g') loginErrorMessage=$(echo "$loginInfo" | jq -r '.message')
if [[ "$loginErrorMessage" != "null" ]]; then if [[ "$loginErrorMessage" != "null" ]]; then
echo "Login failed: $loginErrorMessage" echo "Login failed: $loginErrorMessage"
exit 1 exit 1
fi fi
token=$(echo "$loginInfo" | jq '.token' | sed 's/"//g') token=$(echo "$loginInfo" | jq -r '.token')
fi fi
header="Authorization: $token" header="Authorization: $token"
...@@ -29,7 +29,7 @@ makeBuild() { ...@@ -29,7 +29,7 @@ makeBuild() {
if [[ -z "$appVersionPlatform" ]]; then if [[ -z "$appVersionPlatform" ]]; then
appVersionPlatform=win32 appVersionPlatform=win32
fi fi
appVersion=$(curl -sL -H "$header" "$apiRoot/release/api/app?id=$appName" | jq ".data[0].appData.version.$appVersionPlatform" | sed 's/"//g') appVersion=$(curl -sL -H "$header" "$apiRoot/release/api/app?id=$appName" | jq -r ".data[0].appData.version.$appVersionPlatform")
fi fi
echo "Version: $appVersion" echo "Version: $appVersion"
currentPath="$PWD" currentPath="$PWD"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment