Merge pull request #39 from YunoHost-Apps/testing

Testing

pull_request_template.md

@@ -0,0 +1,25 @@
+## Problem
+- *Description of why you made this PR*
+
+## Solution
+- *And how you fix that*
+
+## PR Status
+- [ ] Code finished.
+- [ ] Tested with Package_check.
+- [ ] Fix or enhancement tested.
+- [ ] Upgrade from last version tested.
+- [ ] Can be reviewed and tested.
+
+## Validation
+---
+*Minor decision*
+- **Upgrade previous version** : 
+- [ ] **Code review** : 
+- [ ] **Approval (LGTM)** : 
+- [ ] **Approval (LGTM)** : 
+- **CI succeeded** : 
+[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/roundcube_ynh%20-BRANCH-%20(Official)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/roundcube_ynh%20-BRANCH-%20(Official)/) *Please replace '-BRANCH-' in this link for a PR from a local branch.*  
+or  
+[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/roundcube_ynh%20PR-NUM-%20(Official_fork)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/roundcube_ynh%20PR-NUM-%20(Official_fork)/) *Replace '-NUM-' by the PR number in this link for a PR from a forked repository.*  
+When the PR is marked as ready to merge, you have to wait for 3 days before really merging it.

scripts/_common.sh

@@ -5,7 +5,12 @@
 # =============================================================================
 
 # Package dependencies
-pkg_dependencies="php5-cli php5-common php5-intl php5-json php5-mcrypt php-pear php-auth-sasl php-mail-mime php-patchwork-utf8 php-net-smtp php-net-socket php-crypt-gpg php-net-ldap2 php-net-ldap3"
+pkg_dependencies="php5-cli php5-common php5-intl php5-json php5-mcrypt php-pear php-auth-sasl php-mail-mime php-patchwork-utf8 php-net-smtp php-net-socket php-net-ldap2 php-net-ldap3"
+if [ "$(lsb_release --codename --short)" != "jessie" ]; then
+  pkg_dependencies="$pkg_dependencies php-zip"
+else
+  pkg_dependencies="$pkg_dependencies php-crypt-gpg"
+fi
 
 # Plugins version
 contextmenu_version=2.3

scripts/install

@@ -58,10 +58,12 @@ ynh_app_setting_set $app with_enigma $with_enigma
 #=================================================
 
 # jessie-backports is needed for php-net-ldap3
-grep -q -R 'jessie-backports' /etc/apt/sources.list{,.d} || {
+if [ "$(lsb_release --codename --short)" = "jessie" ]; then
-  echo "deb http://httpredir.debian.org/debian jessie-backports main" \
+      grep -q -R 'jessie-backports' /etc/apt/sources.list{,.d} || {
-    | tee -a /etc/apt/sources.list.d/backports.list >/dev/null
+         echo "deb http://httpredir.debian.org/debian jessie-backports main" \
-}
+           | tee -a /etc/apt/sources.list.d/backports.list >/dev/null
+      }
+fi
 
 ynh_install_app_dependencies "$pkg_dependencies"
 

scripts/restore

@@ -41,6 +41,20 @@ ynh_webpath_available $domain $path_url \
 test ! -d $final_path \
 	|| ynh_die "There is already a directory: $final_path "
 
+#=================================================
+# INSTALL DEPENDENCIES
+#=================================================
+
+# jessie-backports is needed for php-net-ldap3
+if [ "$(lsb_release --codename --short)" = "jessie" ]; then
+      grep -q -R 'jessie-backports' /etc/apt/sources.list{,.d} || {
+         echo "deb http://httpredir.debian.org/debian jessie-backports main" \
+           | tee -a /etc/apt/sources.list.d/backports.list >/dev/null
+      }
+fi
+
+ynh_install_app_dependencies "$pkg_dependencies"
+
 #=================================================
 # STANDARD RESTORATION STEPS
 #=================================================

scripts/upgrade

@@ -62,10 +62,12 @@ path_url=$(ynh_normalize_url_path $path_url)
 #=================================================
 
 # jessie-backports is needed for php-net-ldap3
-grep -q -R 'jessie-backports' /etc/apt/sources.list{,.d} || {
+if [ "$(lsb_release --codename --short)" = "jessie" ]; then
-  echo "deb http://httpredir.debian.org/debian jessie-backports main" \
+      grep -q -R 'jessie-backports' /etc/apt/sources.list{,.d} || {
-    | tee -a /etc/apt/sources.list.d/backports.list >/dev/null
+         echo "deb http://httpredir.debian.org/debian jessie-backports main" \
-}
+           | tee -a /etc/apt/sources.list.d/backports.list >/dev/null
+      }
+fi
 
 ynh_install_app_dependencies "$pkg_dependencies"