Merge pull request #50 from yalh76/testing

Update to 1.3.8 + readme additional informations

README.md

@@ -1,28 +1,23 @@
-Roundcube for YunoHost
+# Roundcube for YunoHost
 ----------------------
 
+[![Integration level](https://dash.yunohost.org/integration/roundcube.svg)](https://dash.yunohost.org/appci/app/roundcube)  
+[![Install roundcube with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=roundcube)
+
+> *This package allow you to install roundcube quickly and simply on a YunoHost server.  
+If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.*
+
+## Overview
 [Roundcube](https://roundcube.net/) is a browser-based multilingual IMAP client with
 an application-like user interface.
 
-**Shipped version:** 1.3.6
+**Shipped version:** 1.3.8
 
-![](https://roundcube.net/images/screens/mailview.jpg)
+![](https://roundcube.net/images/screens/mailbox.png)
 
-## Features
+## Licence
 
-In addition to Roundcube core features, the following are made available with
+LICENCE: GPL-3.0-only
-this package:
-
- * Integrate with YunoHost users and SSO - i.e. logout button, YunoHost users
-   search
- * Synchronize your email aliases as identities in Roundcube
- * Install the [contextmenu](https://plugins.roundcube.net/packages/johndoh/contextmenu)
-   and [automatic addressbook](https://plugins.roundcube.net/packages/sblaisot/automatic_addressbook)
-   plugins by default
- * Allow to install the [CardDAV](https://plugins.roundcube.net/packages/roundcube/carddav)
-   (address book) synchronization plugin at the installation - note that if
-   you have installed ownCloud or Baïkal, it will automatically add the
-   corresponding and existing address book.
 
 ## Extend and tweak
 
@@ -76,7 +71,36 @@ steps as needed.
 You can also download the plugin and put it under the `plugins/` directory. In this
 case, do not forget to change ownerships of this folder to `roundcube`.
 
+## YunoHost specific features
+
+In addition to Roundcube core features, the following are made available with
+this package:
+
+ * Synchronize your email aliases as identities in Roundcube
+ * Install the [contextmenu](https://plugins.roundcube.net/packages/johndoh/contextmenu)
+   and [automatic addressbook](https://plugins.roundcube.net/packages/sblaisot/automatic_addressbook)
+   plugins by default
+ * Allow to install the [CardDAV](https://plugins.roundcube.net/packages/roundcube/carddav)
+   (address book) synchronization plugin at the installation - note that if
+   you have installed ownCloud or Baïkal, it will automatically add the
+   corresponding and existing address book.
+
+#### Multi-users support
+* Integrate with YunoHost users and SSO - i.e. logout button, YunoHost users
+  search
+#### Supported architectures
+
+* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/roundcube%20%28Official%29.svg)](https://ci-apps.yunohost.org/ci/apps/roundcube/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/roundcube%20%28Official%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/roundcube/)
+* Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/roundcube%20%28Official%29.svg)](https://ci-stretch.nohost.me/ci/apps/roundcube/)
+
+## Limitations
+
+* No known limitations.
+
+
 ## Links
 
+ * Report a bug: https://github.com/YunoHost-Apps/roundcube_ynh/issues
  * Roundcube website: https://roundcube.net/
  * YunoHost website: https://yunohost.org/

conf/app.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.3.6/roundcubemail-1.3.6.tar.gz
+SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.3.8/roundcubemail-1.3.8.tar.gz
-SOURCE_SUM=5796670080c9c3c4071eecc70ddcb6b5df98d8a241a73e8a687fd536a9410c7a
+SOURCE_SUM=93314f125033d8ce2755198367c45bdd2f4cfee5d7688f913877beeb6c532858
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true

manifest.json

@@ -7,8 +7,8 @@
         "fr": "Webmail Open Source"
     },
     "url": "https://roundcube.net/",
-    "license": "GPL-3",
+    "license": "GPL-3.0-only",
-    "version": "1.3.6~ynh1",
+    "version": "1.3.8~ynh1",
     "maintainer": {
         "name": "YunoHost Contributors",
         "email": "apps@yunohost.org"

scripts/_common.sh

@@ -15,7 +15,7 @@ fi
 # Plugins version
 contextmenu_version=2.3
 automatic_addressbook_version=v0.4.3
-carddav_version=2.0.4
+carddav_version=3.0.3
 
 # =============================================================================
 # COMMON ROUNDCUBE FUNCTIONS

scripts/backup

@@ -2,25 +2,24 @@
 
 #=================================================
 # GENERIC START
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-# Exit on command errors and treat access to unset variables as an error
-set -eu
-
 #=================================================
 # IMPORT GENERIC HELPERS
 #=================================================
 
-if [ ! -e _common.sh ]; then
+source ../settings/scripts/_common.sh
-	# Get the _common.sh file if it's not in the current directory
-	cp ../settings/scripts/_common.sh ./_common.sh
-	chmod a+rx _common.sh
-fi
-source _common.sh
 source /usr/share/yunohost/helpers
 
+#=================================================
+# MANAGE SCRIPT FAILURE
+#=================================================
+
+ynh_clean_setup () {
+	### Remove this function if there's nothing to clean before calling the remove script.
+	true
+}
+# Exit if an error occurs during the execution of the script
+ynh_abort_if_errors
+
 #=================================================
 # LOAD SETTINGS
 #=================================================

scripts/restore

@@ -2,25 +2,24 @@
 
 #=================================================
 # GENERIC START
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-# Exit on command errors and treat access to unset variables as an error
-set -eu
-
 #=================================================
 # IMPORT GENERIC HELPERS
 #=================================================
 
-if [ ! -e _common.sh ]; then
+source ../settings/scripts/_common.sh
-	# Get the _common.sh file if it's not in the current directory
-	cp ../settings/scripts/_common.sh ./_common.sh
-	chmod a+rx _common.sh
-fi
-source _common.sh
 source /usr/share/yunohost/helpers
 
+#=================================================
+# MANAGE SCRIPT FAILURE
+#=================================================
+
+ynh_clean_setup () {
+	#### Remove this function if there's nothing to clean before calling the remove script.
+	true
+}
+# Exit if an error occurs during the execution of the script
+ynh_abort_if_errors
+
 #=================================================
 # LOAD SETTINGS
 #=================================================