From 6ed01f443ddc7c575bb2615ddc370dc79e1fed82 Mon Sep 17 00:00:00 2001 From: kload Date: Fri, 2 Oct 2015 07:25:24 -0400 Subject: [PATCH] [enh] Do not install extra packages and configurations on unstable --- install_yunohostv2 | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/install_yunohostv2 b/install_yunohostv2 index 55b167c..9a90e7e 100755 --- a/install_yunohostv2 +++ b/install_yunohostv2 @@ -103,11 +103,12 @@ installscript_dependencies() { } create_custom_config() { - if [[ ! -f /etc/yunohost/yunohost.conf ]] - then - mkdir /etc/yunohost/ - touch /etc/yunohost/from_script - cat << EOF > /etc/yunohost/yunohost.conf + if [[ "$DISTRIB" != "daily" ]] && [[ "$DISTRIB" != "unstable" ]] ; then + if [[ ! -f /etc/yunohost/yunohost.conf ]] + then + mkdir -p /etc/yunohost/ + touch /etc/yunohost/from_script + cat << EOF > /etc/yunohost/yunohost.conf # Yunohost custom config # If you want to keep a custom service configuration replace "no" by "yes" # for the concerned service @@ -124,6 +125,10 @@ slapd=no ssh=yes ssowat=no EOF + fi + else + mkdir -p /etc/yunohost/ + touch /etc/yunohost/from_script fi } @@ -263,13 +268,22 @@ workaround_avahi_installation() { } install_yunohost_packages() { - apt_get_wrapper \ - -o Dpkg::Options::="--force-confold" \ - -y --force-yes install \ - yunohost yunohost-config \ - yunohost-config-postfix \ - postfix postfix-ldap \ - postfix-policyd-spf-perl + if [[ "$DISTRIB" != "daily" ]] && [[ "$DISTRIB" != "unstable" ]] ; then + apt_get_wrapper \ + -o Dpkg::Options::="--force-confold" \ + -y --force-yes install \ + yunohost yunohost-config \ + yunohost-config-postfix \ + postfix postfix-ldap \ + postfix-policyd-spf-perl + else + apt_get_wrapper \ + -o Dpkg::Options::="--force-confold" \ + -y --force-yes install \ + yunohost \ + postfix postfix-ldap \ + postfix-policyd-spf-perl + fi } restart_services() {