From 75f14a07358fe7a60a64120410c56056370201b8 Mon Sep 17 00:00:00 2001 From: "github@kiekerjan.isdronken.nl" Date: Mon, 2 Aug 2021 22:09:04 +0200 Subject: [PATCH] make plugin installation of carddav like other git based installs --- setup/webmail.sh | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/setup/webmail.sh b/setup/webmail.sh index f103e2a9..b2651312 100755 --- a/setup/webmail.sh +++ b/setup/webmail.sh @@ -34,9 +34,7 @@ HASH=3877f0e70f29e7d0612155632e48c3db1e626be3 PERSISTENT_LOGIN_VERSION=6b3fc450cae23ccb2f393d0ef67aa319e877e435 # version 5.2.0 HTML5_NOTIFIER_VERSION=68d9ca194212e15b3c7225eb6085dbcf02fd13d7 # version 0.6.4+ CONTEXT_MENU_VERSION=602a3812922fb8f71814eb3b8d91e9b7859aab7e # version 3.2.1 - -CARDDAV_VERSION=4.1.1 -CARDDAV_HASH=87b73661b7799b2079c28324311eddb4241242bb +CARDDAV_VERSION=b6d1eb31c559ea3ddd8986d287eb82d657477c6e # version 4.1.2 UPDATE_KEY=$VERSION:$PERSISTENT_LOGIN_VERSION:$HTML5_NOTIFIER_VERSION:$CARDDAV_VERSION:$CONTEXT_MENU_VERSION @@ -77,17 +75,10 @@ if [ $needs_update == 1 ]; then # install roundcube html5_notifier plugin git_clone https://github.com/kitist/html5_notifier.git $HTML5_NOTIFIER_VERSION '' ${RCM_PLUGIN_DIR}/html5_notifier - # download and verify the full release of the carddav plugin - wget_verify \ - https://github.com/mstilkerich/rcmcarddav/releases/download/v${CARDDAV_VERSION}/carddav-v${CARDDAV_VERSION}.tar.gz \ - $CARDDAV_HASH \ - /tmp/carddav.tar.gz - - # unzip and cleanup - tar -C ${RCM_PLUGIN_DIR} --no-same-owner -zxf /tmp/carddav.tar.gz - rm -f /tmp/carddav.tar.gz - - # install context menu plugin + # install roundcube carddav plugin + git_clone https://github.com/mstilkerich/rcmcarddav.git $CARDDAV_VERSION '' ${RCM_PLUGIN_DIR}/carddav + + # install roundcube context menu plugin git_clone https://github.com/johndoh/roundcube-contextmenu.git $CONTEXT_MENU_VERSION '' ${RCM_PLUGIN_DIR}/contextmenu # record the version we've installed