From 543aa8876f9d8aa1fb21fc671a21f312e7967e67 Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Wed, 7 Sep 2022 02:25:21 +0200 Subject: [PATCH] Fixed installer and git urls in update scripts --- Resources/UpdateOfflineImap3.sh | 2 +- Resources/UpdateSnappyMail.sh | 2 +- install.sh | 9 ++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Resources/UpdateOfflineImap3.sh b/Resources/UpdateOfflineImap3.sh index 0ade7bb..fba23a0 100644 --- a/Resources/UpdateOfflineImap3.sh +++ b/Resources/UpdateOfflineImap3.sh @@ -8,7 +8,7 @@ printf "OfflineIMAP: checking for upgrades... " if [ "$NewOfflineIMAPVer" != "$(cat /opt/OfflineIMAP3-installed)" ]; then echo "update found" - curl -L https://github.com/OfflineIMAP/offlineimap3/archive/refs/tags/$OfflineIMAPVer.tar.gz -o /tmp/olim3.tar.gz + curl -L https://github.com/OfflineIMAP/offlineimap3/archive/refs/tags/$NewOfflineIMAPVer.tar.gz -o /tmp/olim3.tar.gz mkdir /opt/OfflineIMAP3 tar -C /opt/OfflineIMAP3 -xzf /tmp/olim3.tar.gz --strip 1 sed -i '/kerberos/c\' /opt/OfflineIMAP3/requirements.txt diff --git a/Resources/UpdateSnappyMail.sh b/Resources/UpdateSnappyMail.sh index 90a2f66..acac71c 100644 --- a/Resources/UpdateSnappyMail.sh +++ b/Resources/UpdateSnappyMail.sh @@ -1,6 +1,6 @@ #!/bin/ash ##Script for updating SnappyMailVer -NewSnappyMailVer=$(curl -s https://api.github.com/repos/the-djmaze/snappymail/releases/latest | grep 'tag_name.*' | cut -d : -f 2,3 | tr -d \" |tr -d , |tr -d " ") +NewSnappyMailVer=$(curl -s https://api.github.com/repos/the-djmaze/snappymail/releases/latest | grep 'tag_name.*' | cut -d : -f 2,3 | tr -d \" |tr -d , |tr -d " "| tr -d : ) printf "SnappyMail: checking for upgrades... " diff --git a/install.sh b/install.sh index bcc3824..132b3be 100644 --- a/install.sh +++ b/install.sh @@ -16,11 +16,10 @@ if [ -z ${DistoBuilderINT+x} ]; then fi #Download Resources -OfflineIMAPVer=$(curl -s https://api.github.com/repos/OfflineIMAP/offlineimap3/tags | grep 'name.*' |head -n 1 | cut -d : -f 2,3 | tr -d \" |tr -d , |tr -d " ") -SnappyMailVer=$(curl -s https://api.github.com/repos/the-djmaze/snappymail/releases/latest | grep 'tag_name.*' | cut -d : -f 2,3 | tr -d \" |tr -d , |tr -d " ") +OfflineIMAPVer=$(curl -s https://api.github.com/repos/OfflineIMAP/offlineimap3/tags | grep 'name.*' |head -n 1 | cut -d : -f 2,3 | tr -d \" |tr -d , |tr -d " "| tr -d : ) +SnappyMailVer=$(curl -s https://api.github.com/repos/the-djmaze/snappymail/releases/latest | grep 'tag_name.*' | cut -d : -f 2,3 | tr -d \" |tr -d , |tr -d " "| tr -d : ) echo "$OfflineIMAPVer" > /opt/OfflineIMAP3-installed -echo "$SnappyMailVer" > /opt/SnappyMail-installed -https://github.com/the-djmaze/snappymail/releases/download/v2.17.4/snappymail-2.17.4.tar.gz +echo "$SnappyMailVer" > /opt/SnappyMail-installed> curl -L https://github.com/the-djmaze/snappymail/releases/download/$SnappyMailVer/snappymail-${SnappyMailVer//v}.tar.gz -o /tmp/smc.tar.gz || exit 1 curl -L https://github.com/OfflineIMAP/offlineimap3/archive/refs/tags/$OfflineIMAPVer.tar.gz -o /tmp/olim3.tar.gz || exit 1 @@ -41,10 +40,10 @@ rm /etc/php8/php-fpm.d/* mv Configs/php.conf /etc/php8/php-fpm.d/railoop.conf #Install Webmail +mkdir -p /opt/webmail/data/_data_/_default_/configs /opt/webmail/data/_data_/_default_/domains tar -C /opt/webmail -xzf /tmp/smc.tar.gz #Configure Webmail -mkdir -p /opt/webmail/data/_data_/_default_/configs /opt/webmail/data/_data_/_default_/domains touch /opt/webmail/data/_data_/_default_/domains/disabled mv Configs/SnappyMail-application.ini /opt/webmail/data/_data_/_default_/configs/application.ini mv Configs/SnappyMail-Domain-localhost.ini /opt/webmail/data/_data_/_default_/domains/localhost.ini