From 8b89c281ea711e0e473c8c428167917ee8a36029 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89mile=20Morel?= Date: Thu, 7 May 2015 22:45:11 +0200 Subject: [PATCH 1/2] return 0 when script run entirly well --- autoinstall_yunohostv2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/autoinstall_yunohostv2 b/autoinstall_yunohostv2 index e66768a..12f31fc 100755 --- a/autoinstall_yunohostv2 +++ b/autoinstall_yunohostv2 @@ -6,6 +6,7 @@ ERR_FAIL_UPDATE=2 ERR_FAIL_INSTALL=3 ERR_CANCEL_INSTALL=4 ERR_IMPOSSIBLE=-1 +NO_ERR=0 function bck { FULLPATH="$(readlink -f "$1")" @@ -151,4 +152,4 @@ else fi # Security : we shouldn't be able to exit here -exit $ERR_IMPOSSIBLE +exit $NO_ERR From cc946b0214838bdc6bc0b3495ae0172221c957a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89mile=20Morel?= Date: Thu, 7 May 2015 22:47:34 +0200 Subject: [PATCH 2/2] add jessie compatibility in autoscript --- autoinstall_yunohostv2 | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/autoinstall_yunohostv2 b/autoinstall_yunohostv2 index 12f31fc..0b077e6 100755 --- a/autoinstall_yunohostv2 +++ b/autoinstall_yunohostv2 @@ -41,6 +41,12 @@ do fi done +# Fix install on jessie +if [ $(lsb_release -c | awk '{print $2}') = jessie ]; +then + apt-get install python-xmpp -y +fi + if [[ ! -f /etc/yunohost/yunohost.conf ]] then mkdir /etc/yunohost/ @@ -118,7 +124,12 @@ then echo "Installation" #add answer in debconf db - debconf-set-selections debconfv2 + if [ $(lsb_release -c | awk '{print $2}') = jessie ]; + then + debconf-set-selections $DIR/debconfjessie + else + debconf-set-selections $DIR/debconfv2 + fi #Install yunohost packages apt-get -o Dpkg::Options::="--force-confold" \