1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/roundcube_ynh.git synced 2024-09-03 20:16:28 +02:00

Merge pull request #35 from Rafi594/patch-5

[fix] stretch
This commit is contained in:
JimboJoe 2018-06-03 09:11:42 +02:00 committed by GitHub
commit c4951b624f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 9 deletions

View file

@ -5,7 +5,12 @@
# ============================================================================= # =============================================================================
# Package dependencies # 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 # Plugins version
contextmenu_version=2.3 contextmenu_version=2.3

View file

@ -58,10 +58,12 @@ ynh_app_setting_set $app with_enigma $with_enigma
#================================================= #=================================================
# jessie-backports is needed for php-net-ldap3 # 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} || { grep -q -R 'jessie-backports' /etc/apt/sources.list{,.d} || {
echo "deb http://httpredir.debian.org/debian jessie-backports main" \ echo "deb http://httpredir.debian.org/debian jessie-backports main" \
| tee -a /etc/apt/sources.list.d/backports.list >/dev/null | tee -a /etc/apt/sources.list.d/backports.list >/dev/null
} }
fi
ynh_install_app_dependencies "$pkg_dependencies" ynh_install_app_dependencies "$pkg_dependencies"

View file

@ -41,6 +41,20 @@ ynh_webpath_available $domain $path_url \
test ! -d $final_path \ test ! -d $final_path \
|| ynh_die "There is already a directory: $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 # STANDARD RESTORATION STEPS
#================================================= #=================================================

View file

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