From 8b7ed750d8d285006d434374e3b1bf302d85b894 Mon Sep 17 00:00:00 2001
From: Derek Crudgington <derek@federated.company>
Date: Mon, 17 Apr 2023 15:30:55 +0000
Subject: [PATCH] Added fixes for upgrade

---
 lib/functions.sh    | 7 ++-----
 lib/latest-versions | 3 ++-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/functions.sh b/lib/functions.sh
index e52147f..df41d82 100644
--- a/lib/functions.sh
+++ b/lib/functions.sh
@@ -52,7 +52,8 @@ upgrade_federated() {
     echo -ne "\n** Checking $APP.."
 
     [ ! -f "/federated/apps/$APP/.env" ] && fail "File /federated/apps/$APP/.env doesn't exist."
-    APP_VERSION=`grep IMAGE_VERSION /federated/apps/$APP/.env | awk -F= '{ print $2 }'`
+    APP_VERSION_RAW=`grep IMAGE_VERSION /federated/apps/$APP/.env | awk -F= '{ print $2 }'`
+    APP_VERSION="${APP_VERSION_RAW//\"}"
 
     if [ "$APP_VERSION" = "$VERSION" ]; then
       echo -ne "\n   $APP is already at the latest version."
@@ -69,10 +70,6 @@ upgrade_federated() {
   done
 
   echo -ne "\n\n"
-
-#  kill -9 $SPINPID &> /dev/null
-#  echo -ne "done."
-
 }
 create_password() {
 #	eval $1_var=$1
diff --git a/lib/latest-versions b/lib/latest-versions
index e617571..111f244 100644
--- a/lib/latest-versions
+++ b/lib/latest-versions
@@ -1,4 +1,6 @@
+caddy=latest
 baserow=1.14.0
+element=v1.11.19
 calcom=1.0
 postgresql=14
 proxy=1.1
@@ -7,7 +9,6 @@ listmonk=v2.4.0
 panel=v1.11
 vaultwarden=1.28.0
 matrix=v1.75.0
-element=v1.11.19
 mail=11.3.1
 ldap=1.5.0
 dns=3.17.1