From 83b36f2c3aef1ae6d75376938dbf4482ed4e3349 Mon Sep 17 00:00:00 2001 From: Joshua Tauberer Date: Sat, 30 May 2015 14:07:36 +0000 Subject: [PATCH] simplify the roundcube updating logic, changelog entry for roundcube persistent login --- CHANGELOG.md | 1 + setup/webmail.sh | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44b068f2..6a4f7b9c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ CHANGELOG In Development -------------- +* Roundcube now allows persistent logins using Roundcube-Persistent-Login-Plugin. * ownCloud updated to version 8.0.3. * SMTP Submission (port 587) began offering the insecure SSLv3 protocol due to a misconfiguration in the previous version. * Users and aliases weren't working if they were entered with any uppercase letters. Now only lowercase is allowed. diff --git a/setup/webmail.sh b/setup/webmail.sh index e58dde47..7f5e71d4 100755 --- a/setup/webmail.sh +++ b/setup/webmail.sh @@ -36,11 +36,12 @@ VERSION=1.1.1 HASH=08222f382a8dd89bba7dbbad595f48443bec0aa2 VACATION_SIEVE_VERSION=91ea6f52216390073d1f5b70b5f6bea0bfaee7e5 PERSISTENT_LOGIN_VERSION=9a0bc59493beb573d515f82aec443e2098365d11 +UPDATE_KEY=$VERSION:$VACATION_SIEVE_VERSION:$PERSISTENT_LOGIN_VERSION needs_update=0 #NODOC if [ ! -f /usr/local/lib/roundcubemail/version ]; then # not installed yet #NODOC needs_update=1 #NODOC -elif [[ "$VERSION:$VACATION_SIEVE_VERSION:$PERSISTENT_LOGIN_VERSION" != `cat /usr/local/lib/roundcubemail/version` ]]; then +elif [[ "$UPDATE_KEY" != `cat /usr/local/lib/roundcubemail/version` ]]; then # checks if the version is what we want needs_update=1 #NODOC fi @@ -63,7 +64,7 @@ if [ $needs_update == 1 ]; then git_clone https://github.com/mfreiholz/Roundcube-Persistent-Login-Plugin.git $PERSISTENT_LOGIN_VERSION '' /usr/local/lib/roundcubemail/plugins/persistent_login # record the version we've installed - echo $VERSION:$VACATION_SIEVE_VERSION:$PERSISTENT_LOGIN_VERSION > /usr/local/lib/roundcubemail/version + echo $UPDATE_KEY > /usr/local/lib/roundcubemail/version fi # ### Configuring Roundcube