From 1acff0209fe6b94aa72b47758b5ed3b0ec3ce492 Mon Sep 17 00:00:00 2001 From: Rafi59 Date: Thu, 26 Apr 2018 21:29:59 +0200 Subject: [PATCH 1/6] [fix] stretch --- scripts/install | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/install b/scripts/install index ad24650..1d8df02 100644 --- a/scripts/install +++ b/scripts/install @@ -57,11 +57,12 @@ ynh_app_setting_set $app with_enigma $with_enigma # INSTALL DEPENDENCIES #================================================= -# jessie-backports is needed for php-net-ldap3 -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 -} +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" From b03f6f0ea0b18fdf452308c8d5416a037a82ee07 Mon Sep 17 00:00:00 2001 From: Rafi59 Date: Thu, 26 Apr 2018 21:33:43 +0200 Subject: [PATCH 2/6] [fix] stretch --- scripts/_common.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/_common.sh b/scripts/_common.sh index a9f36f9..598ec3e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,6 +6,9 @@ # 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" +if [ "$(lsb_release --codename --short)" != "jessie" ]; then + pkg_dependencies="$pkg_dependencies php-zip" +fi # Plugins version contextmenu_version=2.3 From 53882251a828dfb9916eeed4d27597e8f6f5e14f Mon Sep 17 00:00:00 2001 From: Rafi59 Date: Thu, 26 Apr 2018 21:52:19 +0200 Subject: [PATCH 3/6] Restore comment --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index 1d8df02..bcdb8f1 100644 --- a/scripts/install +++ b/scripts/install @@ -57,6 +57,7 @@ ynh_app_setting_set $app with_enigma $with_enigma # 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" \ From b18e6a1b8988807b937916dbb2e2c72d1e22540e Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Fri, 27 Apr 2018 16:21:16 +0200 Subject: [PATCH 4/6] Fix upgrade as well as install --- scripts/upgrade | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index ff92958..29b9259 100644 --- a/scripts/upgrade +++ b/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} || { - echo "deb http://httpredir.debian.org/debian jessie-backports main" \ - | tee -a /etc/apt/sources.list.d/backports.list >/dev/null -} +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" From cb3db1a477c732b5e97121267bd7066a1408fb93 Mon Sep 17 00:00:00 2001 From: JimboJoe Date: Sat, 26 May 2018 17:19:19 +0200 Subject: [PATCH 5/6] Fix GPG dependency on Stretch php-crypt-gpg doesn't exist any more in Stretch and... isn't needed! --- scripts/_common.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 598ec3e..2a21273 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,9 +5,11 @@ # ============================================================================= # 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" + pkg_dependencies="$pkg_dependencies php-zip" +else + pkg_dependencies="$pkg_dependencies php-crypt-gpg" fi # Plugins version From 31ea930f016157ff940daf0e068c4526cab9c197 Mon Sep 17 00:00:00 2001 From: JimboJoe Date: Sat, 26 May 2018 18:24:50 +0200 Subject: [PATCH 6/6] Install dependencies on restore --- scripts/restore | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/scripts/restore b/scripts/restore index 2a2cea6..bf75e1a 100644 --- a/scripts/restore +++ b/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 #=================================================