From 05eda91a2fbaed1e13c733230238fc68475c535e Mon Sep 17 00:00:00 2001
From: Lukas Schauer <lukas@schauer.so>
Date: Wed, 26 Jun 2019 12:29:39 +0200
Subject: [PATCH] release 0.6.5 (fixed apiv1 compatibility...)

---
 CHANGELOG  |  4 ++++
 dehydrated | 25 +++++++++++++------------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index f59cd048..c95f022e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,10 @@
 # Change Log
 This file contains a log of major changes in dehydrated
 
+## [0.6.5] - 2019-06-26
+## Fixed
+- Fixed broken APIv1 compatibility from last update
+
 ## [0.6.4] - 2019-06-25
 ## Changed
 - Fetch account ID from Location header instead of account json
diff --git a/dehydrated b/dehydrated
index 52b2355d..624cd858 100755
--- a/dehydrated
+++ b/dehydrated
@@ -17,7 +17,7 @@ umask 077 # paranoid umask, we're creating private keys
 exec 3>&-
 exec 4>&-
 
-VERSION="0.6.4"
+VERSION="0.6.5"
 
 # Find directory in which this script is stored by traversing all symbolic links
 SOURCE="${0}"
@@ -403,20 +403,21 @@ init_system() {
 
   # Read account information or request from CA if missing
   if [[ -e "${ACCOUNT_KEY_JSON}" ]]; then
-    if [[ ! -e "${ACCOUNT_ID_JSON}" ]]; then
-      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_ID="${ACCOUNT_URL##*/}"
-      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
     if [[ ${API} -eq 1 ]]; then
+      ACCOUNT_ID="$(cat "${ACCOUNT_KEY_JSON}" | get_json_int_value id)"
       ACCOUNT_URL="${CA_REG}/${ACCOUNT_ID}"
     else
+      if [[ -e "${ACCOUNT_ID_JSON}" ]]; then
+        ACCOUNT_ID="$(cat "${ACCOUNT_ID_JSON}" | get_json_string_value id)"
+      else
+        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_ID="${ACCOUNT_URL##*/}"
+        if [[ -z "${ACCOUNT_ID}" ]]; then
+          _exiterr "Unknown error on fetching account information"
+        fi
+        echo '{"id": "'"${ACCOUNT_ID}"'"}' > "${ACCOUNT_ID_JSON}"
+      fi
       ACCOUNT_URL="${CA_ACCOUNT}/${ACCOUNT_ID}"
     fi
   else