From 0b2d0933d049b0af8a8a1f71d88926f7f599d3ae Mon Sep 17 00:00:00 2001
From: Ben Peddell <klightspeed@killerwolves.net>
Date: Wed, 4 Apr 2018 22:54:50 +1000
Subject: [PATCH] Fix some breakages due to API output changes

---
 tools/arkmanager | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tools/arkmanager b/tools/arkmanager
index 0e5a3cb..dbce7b9 100755
--- a/tools/arkmanager
+++ b/tools/arkmanager
@@ -844,9 +844,9 @@ function isTheServerUp(){
 #
 function isTheServerOnline(){
   if [ -n "$(getMultiHome)" ]; then
-    publicip="$(curl --interface "$(getMultiHomeIP)" -s http://api.ipify.org/)"
+    publicip="$(curl --interface "$(getMultiHomeIP)" -s https://api.ipify.org/)"
   else
-    publicip="$(curl -s http://api.ipify.org/)"
+    publicip="$(curl -s https://api.ipify.org/)"
   fi
   local serverresp
 
@@ -856,7 +856,7 @@ function isTheServerOnline(){
 
   # If the Steam server response contains "addr": "$ip:$port",
   # then the server has registered with the Steam master server
-  if [[ "$serverresp" =~ "\"addr\": \""([^\"]*):([0-9]*)"\"" ]]; then
+  if [[ "$serverresp" =~ \"addr\":[[:space:]]*\"([^\"]*):([0-9]*)\" ]]; then
     return 0
   else
     return 1
@@ -2129,7 +2129,11 @@ getLocalModLastUpdated(){
 #
 getAvailModLastUpdated(){
   local modid="$1"
-  local remupd="$(curl -s -d "itemcount=1&publishedfileids[0]=${modid}" http://api.steampowered.com/ISteamRemoteStorage/GetPublishedFileDetails/v1 | sed -n 's|^[[:space:]]*"time_updated": \(.*\),|\1|p')"
+  local serverresp="$(curl -s -d "itemcount=1&publishedfileids[0]=${modid}" "http://api.steampowered.com/ISteamRemoteStorage/GetPublishedFileDetails/v1")"
+  local remupd=
+  if [[ "$serverresp" =~ \"time_updated\":[[:space:]]*([^,]*) ]]; then
+    remupd="${BASH_REMATCH[1]}"
+  fi
   echo "$remupd"
 }