starred/dehydrated
1
0
Fork 0
mirror of https://github.com/dehydrated-io/dehydrated.git synced 2026-04-24 01:08:29 +02:00
Code Issues 79 Packages Projects Releases 10 Wiki Activity

Merge tag 'v0.6.5'

Browse Source
This commit is contained in:
Lukas Schauer
2019-07-06 19:25:32 +02:00
parent f60f2f81e8 05eda91a2f
commit 018254974c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dehydrated
View File

@@ -407,16 +407,16 @@ init_system() {
ACCOUNT_ID="$(cat "${ACCOUNT_KEY_JSON}" | get_json_int_value id)" ACCOUNT_ID="$(cat "${ACCOUNT_KEY_JSON}" | get_json_int_value id)"
ACCOUNT_URL="${CA_REG}/${ACCOUNT_ID}" ACCOUNT_URL="${CA_REG}/${ACCOUNT_ID}"
else else
if [[ ! -e "${ACCOUNT_ID_JSON}" ]]; then if [[ -e "${ACCOUNT_ID_JSON}" ]]; then
ACCOUNT_ID="$(cat "${ACCOUNT_ID_JSON}" | get_json_string_value id)"
else
echo "+ Fetching account ID..." echo "+ Fetching account ID..."
ACCOUNT_URL="$(signed_request "${CA_NEW_ACCOUNT}" '{"onlyReturnExisting": true}' 4>&1 | grep -i ^Location: | awk '{print $2}' | tr -d '\r\n')" ACCOUNT_URL="$(signed_request "${CA_NEW_ACCOUNT}" '{"onlyReturnExisting": true}' 4>&1 | grep -i ^Location: | awk '{print $2}' | tr -d '\r\n')"
ACCOUNT_ID="${ACCOUNT_URL##*/}" ACCOUNT_ID="${ACCOUNT_URL##*/}"
if [[ -z "${ACCOUNT_ID}" ]]; then
_exiterr "Unknown error on fetching account information"
fi
echo '{"id": "'"${ACCOUNT_ID}"'"}' > "${ACCOUNT_ID_JSON}" echo '{"id": "'"${ACCOUNT_ID}"'"}' > "${ACCOUNT_ID_JSON}"
else
ACCOUNT_ID="$(cat "${ACCOUNT_ID_JSON}" | get_json_string_value id)"
fi
if [[ -z "${ACCOUNT_ID}" ]]; then
_exiterr "Unknown error on fetching account information"
fi fi
ACCOUNT_URL="${CA_ACCOUNT}/${ACCOUNT_ID}" ACCOUNT_URL="${CA_ACCOUNT}/${ACCOUNT_ID}"
fi fi