From 3e2a816a7230e7e014183dfe8d9fa93b833990e8 Mon Sep 17 00:00:00 2001 From: Kload Date: Thu, 17 Oct 2013 09:43:10 +0200 Subject: [PATCH] Remove LemonLDAP from script --- autoinstall_yunohostv2 | 16 +++++----------- install_yunohostv2 | 16 +++++----------- 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/autoinstall_yunohostv2 b/autoinstall_yunohostv2 index 8ba9f2d..c88e157 100755 --- a/autoinstall_yunohostv2 +++ b/autoinstall_yunohostv2 @@ -52,7 +52,7 @@ amavis=no apache2=no dovecot=no iptables=no -lemonldap-ng=no +ssowat=no postfix=no proftpd=no radicale=no @@ -90,20 +90,14 @@ then echo "deb http://repo.yunohost.org/ megusta main" >> $CUSTOMAPT fi - grep -qri "lemonldap" $CUSTOMAPT - if [[ $? -eq 1 ]] - then - echo "deb http://repo.yunohost.org/ lemonldap main" >> $CUSTOMAPT - fi - - if [ $# -eq 1 ]; then - if [[ "$1" == "test" ]]; then - echo "deb http://repo.yunohost.org/ test main" >> $CUSTOMAPT + if [[ "$1" == "test" ]]; then + grep -qri "test" $CUSTOMAPT + if [ $# -eq 1 ]; then + echo "deb http://repo.yunohost.org/ test main" >> $CUSTOMAPT fi fi #Get gpg key - wget -O- http://lemonldap-ng.org/_media/rpm-gpg-key-ow2 -q | apt-key add - -qq wget -O- http://repo.yunohost.org/yunohost.asc -q | apt-key add - -qq #Update repo diff --git a/install_yunohostv2 b/install_yunohostv2 index b195276..44c3ece 100755 --- a/install_yunohostv2 +++ b/install_yunohostv2 @@ -53,7 +53,7 @@ amavis=no apache2=no dovecot=no iptables=no -lemonldap-ng=no +ssowat=no postfix=no proftpd=no radicale=no @@ -92,20 +92,14 @@ then echo "deb http://repo.yunohost.org/ megusta main" >> $CUSTOMAPT fi - grep -qri "lemonldap" $CUSTOMAPT - if [[ $? -eq 1 ]] - then - echo "deb http://repo.yunohost.org/ lemonldap main" >> $CUSTOMAPT - fi - - if [ $# -eq 1 ]; then - if [[ "$1" == "test" ]]; then - echo "deb http://repo.yunohost.org/ test main" >> $CUSTOMAPT + if [[ "$1" == "test" ]]; then + grep -qri "test" $CUSTOMAPT + if [ $# -eq 1 ]; then + echo "deb http://repo.yunohost.org/ test main" >> $CUSTOMAPT fi fi #Get gpg key - wget -O- http://lemonldap-ng.org/_media/rpm-gpg-key-ow2 -q | apt-key add - -qq wget -O- http://repo.yunohost.org/yunohost.asc -q | apt-key add - -qq #Update repo