From 1b561ee10f66ee3d9f10d80ccd498d3f41750102 Mon Sep 17 00:00:00 2001
From: uwe <uwe@meitner>
Date: Sun, 13 Feb 2022 11:30:06 +0100
Subject: [PATCH 1/3] upgrade script

---
 upgrade_snappymail | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 upgrade_snappymail

diff --git a/upgrade_snappymail b/upgrade_snappymail
new file mode 100644
index 000000000..8996dda9b
--- /dev/null
+++ b/upgrade_snappymail
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+if [[ $(id -u) -ne 0 ]] ; then echo "Please run as root" ; exit 1 ; fi
+
+GITHUB_URL="https://github.com/the-djmaze/snappymail/releases/latest"
+YOUR_SERVER_FOLDER="/var/www/snappy.somesite.com/"
+
+# UPGRADING Snappymail
+#
+# I've found this to be working fine when upgrading my Snappymail. The
+# commands should be used at your own risk. I take no responsibility.
+#
+# This example assumes that Snappymail is installed in the following
+# folder;
+#
+#     /var/www/snappy.somesite.com/ -- see $YOUR_SERVER_FOLDER
+#
+# Change the path to match your setup. 
+#
+# By Uwe Bieling <pychi@gmx.de>
+
+# Safty First ... make a backup
+cd $YOUR_SERVER_FOLDER && cd ..
+tar -czf backup_snappymail_`date +%Y%m%d`.tar.gz $YOUR_SERVER_FOLDER
+
+# Download last release to /tmp
+cd /tmp
+curl -L -s $GITHUB_URL | grep -m 1 "href.*snappymail.*tar.gz" | sed "s/^.*href=\"//g" | sed "s/\".*$//g" | wget --base=http://github.com -i - -O snappy.tar.gz
+
+# extract last release to folder
+tar -xzvf snappy.tar.gz -C $YOUR_SERVER_FOLDER
+
+# set permissions
+find $YOUR_SERVER_FOLDER -type d -exec chmod 755 {} \;
+find $YOUR_SERVER_FOLDER -type f -exec chmod 644 {} \;
+chown -R www-data:www-data $YOUR_SERVER_FOLDER
+
+echo -e "\033[1;32mFinished upgrading snappymail ... \033[0m"

From 6d6ab73b725af94ec760d5cb43f83251324d01ea Mon Sep 17 00:00:00 2001
From: uwe <uwe@meitner>
Date: Mon, 21 Mar 2022 17:57:07 +0100
Subject: [PATCH 2/3] show versions

show versions of recent snappymail and new snappymail
---
 upgrade_snappymail | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/upgrade_snappymail b/upgrade_snappymail
index 8996dda9b..757e20861 100644
--- a/upgrade_snappymail
+++ b/upgrade_snappymail
@@ -25,7 +25,12 @@ tar -czf backup_snappymail_`date +%Y%m%d`.tar.gz $YOUR_SERVER_FOLDER
 
 # Download last release to /tmp
 cd /tmp
-curl -L -s $GITHUB_URL | grep -m 1 "href.*snappymail.*tar.gz" | sed "s/^.*href=\"//g" | sed "s/\".*$//g" | wget --base=http://github.com -i - -O snappy.tar.gz
+DOWNLOAD_DATA=`curl -L -s $GITHUB_URL | grep -m 1 "href.*snappymail.*tar.gz" | sed "s/^.*href=\"//g" | sed "s/\".*$//g"`
+echo $DOWNLOAD_DATA | wget --base=http://github.com -i - -O snappy.tar.gz
+
+# Get Versions
+OLD_VERSION=`cat $YOUR_SERVER_FOLDER"data/VERSION"`
+NEW_VERSION=`echo $DOWNLOAD_DATA | grep -o "v.*/"`
 
 # extract last release to folder
 tar -xzvf snappy.tar.gz -C $YOUR_SERVER_FOLDER
@@ -35,4 +40,4 @@ find $YOUR_SERVER_FOLDER -type d -exec chmod 755 {} \;
 find $YOUR_SERVER_FOLDER -type f -exec chmod 644 {} \;
 chown -R www-data:www-data $YOUR_SERVER_FOLDER
 
-echo -e "\033[1;32mFinished upgrading snappymail ... \033[0m"
+echo -e "\033[1;32mFinished with snappymail-upgrade from $OLD_VERSION to ${NEW_VERSION:1:-1}... \033[0m"

From 333cb37ed349862e65434bdd91091489a5769c91 Mon Sep 17 00:00:00 2001
From: uwe <uwe@meitner>
Date: Wed, 23 Mar 2022 19:36:31 +0100
Subject: [PATCH 3/3] removed link scrapping and added improvements

---
 upgrade_snappymail | 52 +++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/upgrade_snappymail b/upgrade_snappymail
index 757e20861..2327a905a 100644
--- a/upgrade_snappymail
+++ b/upgrade_snappymail
@@ -1,43 +1,43 @@
 #!/bin/bash
 
-if [[ $(id -u) -ne 0 ]] ; then echo "Please run as root" ; exit 1 ; fi
-
-GITHUB_URL="https://github.com/the-djmaze/snappymail/releases/latest"
-YOUR_SERVER_FOLDER="/var/www/snappy.somesite.com/"
-
 # UPGRADING Snappymail
 #
 # I've found this to be working fine when upgrading my Snappymail. The
 # commands should be used at your own risk. I take no responsibility.
 #
-# This example assumes that Snappymail is installed in the following
-# folder;
-#
-#     /var/www/snappy.somesite.com/ -- see $YOUR_SERVER_FOLDER
-#
-# Change the path to match your setup. 
+# The script can only be run from the  SnappyMail install directory!
 #
 # By Uwe Bieling <pychi@gmx.de>
+# and Jordan S (https://github.com/jas8522)
+
+if [[ $(id -u) -ne 0 ]] ; then echo -e "\033[1;31mPlease run as root\033[0m" ; exit 1 ; fi
+
+dir=$(pwd)
+if [ ! -d "$dir/snappymail/v" ] ; then echo -e "\033[1;31mThis script can only be run from the SnappyMail install directory\033[0m" ; exit 1 ; fi
+
+LATEST_URL="https://snappymail.eu/repository/latest.tar.gz"
+
+OWNERGROUP=`stat -c "%U:%G" snappymail`
+OLD_VERSION=`grep "define('APP_VERSION" index.php | awk -F\' '{print $4}'`
 
 # Safty First ... make a backup
-cd $YOUR_SERVER_FOLDER && cd ..
-tar -czf backup_snappymail_`date +%Y%m%d`.tar.gz $YOUR_SERVER_FOLDER
+DSTAMP=`date +%Y-%m-%d`
+echo -e "\033[1;33mBacking up snappymail $OLD_VERSION to ../backup_snappymail_${DSTAMP}.tar.gz\033[0m"
+tar -czf ../backup_snappymail_${DSTAMP}.tar.gz .
 
 # Download last release to /tmp
-cd /tmp
-DOWNLOAD_DATA=`curl -L -s $GITHUB_URL | grep -m 1 "href.*snappymail.*tar.gz" | sed "s/^.*href=\"//g" | sed "s/\".*$//g"`
-echo $DOWNLOAD_DATA | wget --base=http://github.com -i - -O snappy.tar.gz
+echo -e "\033[1;33mDownloading last release\033[0m"
+wget $LATEST_URL -O /tmp/snappymail_latest.tar.gz
+NEW_VERSION=`tar -tf /tmp/snappymail_latest.tar.gz | grep "snappymail/v/.*/index.php" | awk -F/ '{print $3}'`
 
-# Get Versions
-OLD_VERSION=`cat $YOUR_SERVER_FOLDER"data/VERSION"`
-NEW_VERSION=`echo $DOWNLOAD_DATA | grep -o "v.*/"`
-
-# extract last release to folder
-tar -xzvf snappy.tar.gz -C $YOUR_SERVER_FOLDER
+echo -e "\033[1;33mInstalling $NEW_VERSION\033[0m"
+tar -xzf /tmp/snappymail_latest.tar.gz
 
 # set permissions
-find $YOUR_SERVER_FOLDER -type d -exec chmod 755 {} \;
-find $YOUR_SERVER_FOLDER -type f -exec chmod 644 {} \;
-chown -R www-data:www-data $YOUR_SERVER_FOLDER
+echo -e "\033[1;33mSet permissions\033[0m"
+find . -type d -exec chmod 755 {} \;
+find . -type f -exec chmod 644 {} \;
+chmod u+x upgrade_snappymail
+chown -R $OWNERGROUP *
 
-echo -e "\033[1;32mFinished with snappymail-upgrade from $OLD_VERSION to ${NEW_VERSION:1:-1}... \033[0m"
+echo -e "\033[1;32mFinished with snappymail upgrade from $OLD_VERSION to $NEW_VERSION... \033[0m"