From f8ac8967950fda37e7ebb5b90befb1b460803ded Mon Sep 17 00:00:00 2001 From: Hoekynl Date: Sat, 5 Sep 2015 23:33:19 +0200 Subject: [PATCH 1/3] Include html5_notifier by default Include the roundcube plugin html_notifier by default --- setup/webmail.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/setup/webmail.sh b/setup/webmail.sh index 3f258829..78c632ec 100755 --- a/setup/webmail.sh +++ b/setup/webmail.sh @@ -63,6 +63,9 @@ if [ $needs_update == 1 ]; then # install roundcube persistent_login plugin git_clone https://github.com/mfreiholz/Roundcube-Persistent-Login-Plugin.git $PERSISTENT_LOGIN_VERSION '' /usr/local/lib/roundcubemail/plugins/persistent_login + # install roundcube html5_notifier plugin + git_clone https://github.com/kitist/html5_notifier.git /usr/local/lib/roundcubemail/plugins/html5_notifier + # record the version we've installed echo $UPDATE_KEY > /usr/local/lib/roundcubemail/version fi @@ -96,7 +99,7 @@ cat > /usr/local/lib/roundcubemail/config/config.inc.php < Date: Sun, 6 Sep 2015 10:20:36 +0200 Subject: [PATCH 2/3] Added commit version hash. Working now. Added HTML5_NOTIFIER_VERSION Updated git_clone to work. Tested and working. --- setup/webmail.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/setup/webmail.sh b/setup/webmail.sh index 78c632ec..e50b74d3 100755 --- a/setup/webmail.sh +++ b/setup/webmail.sh @@ -37,7 +37,8 @@ VERSION=1.1.2 HASH=df88deae691da3ecf3e9f0aee674c1f3042ea1eb VACATION_SIEVE_VERSION=91ea6f52216390073d1f5b70b5f6bea0bfaee7e5 PERSISTENT_LOGIN_VERSION=117fbd8f93b56b2bf72ad055193464803ef3bc36 -UPDATE_KEY=$VERSION:$VACATION_SIEVE_VERSION:$PERSISTENT_LOGIN_VERSION +HTML5_NOTIFIER_VERSION=968f570d46dd95fb86a14c69796a27e9f9ddaf6b +UPDATE_KEY=$VERSION:$VACATION_SIEVE_VERSION:$PERSISTENT_LOGIN_VERSION:$HTML5_NOTIFIER_VERSION needs_update=0 #NODOC if [ ! -f /usr/local/lib/roundcubemail/version ]; then # not installed yet #NODOC @@ -64,7 +65,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 # install roundcube html5_notifier plugin - git_clone https://github.com/kitist/html5_notifier.git /usr/local/lib/roundcubemail/plugins/html5_notifier + git_clone https://github.com/kitist/html5_notifier.git $HTML5_NOTIFIER_VERSION '' /usr/local/lib/roundcubemail/plugins/html5_notifier # record the version we've installed echo $UPDATE_KEY > /usr/local/lib/roundcubemail/version From d24a2f7cab57503c3ee5483d41d677eec9f5f7a4 Mon Sep 17 00:00:00 2001 From: Hoekynl Date: Sun, 6 Sep 2015 10:22:08 +0200 Subject: [PATCH 3/3] Updated, mistype. Removed :$HTML5_NOTIFIER_VERSION, which breaks it --- setup/webmail.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/webmail.sh b/setup/webmail.sh index e50b74d3..14f45ab8 100755 --- a/setup/webmail.sh +++ b/setup/webmail.sh @@ -38,7 +38,7 @@ HASH=df88deae691da3ecf3e9f0aee674c1f3042ea1eb VACATION_SIEVE_VERSION=91ea6f52216390073d1f5b70b5f6bea0bfaee7e5 PERSISTENT_LOGIN_VERSION=117fbd8f93b56b2bf72ad055193464803ef3bc36 HTML5_NOTIFIER_VERSION=968f570d46dd95fb86a14c69796a27e9f9ddaf6b -UPDATE_KEY=$VERSION:$VACATION_SIEVE_VERSION:$PERSISTENT_LOGIN_VERSION:$HTML5_NOTIFIER_VERSION +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