From c0bf9ca7435aa61933a2c8760dd8e4936b5ecfdf Mon Sep 17 00:00:00 2001
From: Alexis Gavoty <kload@kload.fr>
Date: Sat, 7 Dec 2013 17:15:23 +0100
Subject: [PATCH 1/4] Update install

---
 scripts/install | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/install b/scripts/install
index 6fef299..1fae77e 100755
--- a/scripts/install
+++ b/scripts/install
@@ -7,6 +7,12 @@ admin_passwd=$3
 language=$4
 is_public=$5
 
+# Check if admin password is not null
+if [ "$admin_passwd" = "" ]; then
+echo "Wrong password"
+    exit 1
+fi
+
 # Check domain/path availability
 sudo yunohost app checkurl $domain$path -a wordpress
 if [[ ! $? -eq 0 ]]; then

From 2e61e45825085f9ca19d744ce1449fcf89a5393d Mon Sep 17 00:00:00 2001
From: Alexis Gavoty <kload@kload.fr>
Date: Sat, 7 Dec 2013 17:16:04 +0100
Subject: [PATCH 2/4] Update install

---
 scripts/install | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/install b/scripts/install
index 1fae77e..c96c3a7 100755
--- a/scripts/install
+++ b/scripts/install
@@ -67,7 +67,8 @@ sudo yunohost app setting wordpress skipped_uris -v "/"
 sudo yunohost app ssowatconf
 
 # Wordpress installation
-echo "127.0.0.1 $domain #wordpress" | sudo tee -a /etc/hosts
+echo "127.0.0.1 $domain #yunowordpress" | sudo tee -a /etc/hosts
+sleep 1
 curl -X POST -A "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:12.0) Gecko/20100101 Firefox/12.0" -e "http://$domain$path/wp-admin/install.php?step=2" -H "Content-Type:application/x-www-form-urlencoded" -H "Accept:text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8" -H "Accept-Encoding:gzip, deflate" --data "?step=2&weblog_title=YunoBlog&user_name=admin&admin_password=$admin_passwd&admin_password2=$admin_passwd&admin_email=admin@$domain&Submit=Install+WordPress" http://$domain$path/wp-admin/install.php?step=2&weblog_title=YunoBlog&user_name=admin&admin_password=$admin_passwd&admin_password2=$admin_passwd&admin_email=admin@$domain&Submit=Install+WordPress
 sleep 5
 mysql -u $db_user -p$db_pwd $db_user -e "select * from wp_options;" > /dev/null 2>&1
@@ -89,4 +90,4 @@ then
 else
 	mysql -u $db_user -p$db_pwd $db_user < ../conf/public.sql
 fi
-sudo sed -i '/wordpress/d' /etc/hosts
+sudo sed -i '/yunowordpress/d' /etc/hosts

From 3bb8a03d5fe5a2e7109a746c2992bf0d559566cd Mon Sep 17 00:00:00 2001
From: Alexis Gavoty <kload@kload.fr>
Date: Sat, 7 Dec 2013 17:20:44 +0100
Subject: [PATCH 3/4] Less curly curl

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index c96c3a7..531adec 100755
--- a/scripts/install
+++ b/scripts/install
@@ -69,7 +69,7 @@ sudo yunohost app ssowatconf
 # Wordpress installation
 echo "127.0.0.1 $domain #yunowordpress" | sudo tee -a /etc/hosts
 sleep 1
-curl -X POST -A "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:12.0) Gecko/20100101 Firefox/12.0" -e "http://$domain$path/wp-admin/install.php?step=2" -H "Content-Type:application/x-www-form-urlencoded" -H "Accept:text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8" -H "Accept-Encoding:gzip, deflate" --data "?step=2&weblog_title=YunoBlog&user_name=admin&admin_password=$admin_passwd&admin_password2=$admin_passwd&admin_email=admin@$domain&Submit=Install+WordPress" http://$domain$path/wp-admin/install.php?step=2&weblog_title=YunoBlog&user_name=admin&admin_password=$admin_passwd&admin_password2=$admin_passwd&admin_email=admin@$domain&Submit=Install+WordPress
+curl -kL -X POST --data "?step=2&weblog_title=YunoBlog&user_name=admin&admin_password=$admin_passwd&admin_password2=$admin_passwd&admin_email=admin@$domain&Submit=Install+WordPress" http://$domain$path/wp-admin/install.php?step=2
 sleep 5
 mysql -u $db_user -p$db_pwd $db_user -e "select * from wp_options;" > /dev/null 2>&1
 result=$?

From c7f8f97a3669fdb1c71fe08c1b2af13bd9965077 Mon Sep 17 00:00:00 2001
From: Alexis Gavoty <kload@kload.fr>
Date: Sat, 7 Dec 2013 17:24:42 +0100
Subject: [PATCH 4/4] Even less curly curl

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 531adec..159c79b 100755
--- a/scripts/install
+++ b/scripts/install
@@ -69,7 +69,7 @@ sudo yunohost app ssowatconf
 # Wordpress installation
 echo "127.0.0.1 $domain #yunowordpress" | sudo tee -a /etc/hosts
 sleep 1
-curl -kL -X POST --data "?step=2&weblog_title=YunoBlog&user_name=admin&admin_password=$admin_passwd&admin_password2=$admin_passwd&admin_email=admin@$domain&Submit=Install+WordPress" http://$domain$path/wp-admin/install.php?step=2
+curl -kL -X POST --data "?step=2&weblog_title=YunoBlog&user_name=admin&admin_password=$admin_passwd&admin_password2=$admin_passwd&admin_email=admin@$domain&Submit=Install+WordPress" http://$domain$path/wp-admin/install.php?step=2 > /dev/null 2>&1
 sleep 5
 mysql -u $db_user -p$db_pwd $db_user -e "select * from wp_options;" > /dev/null 2>&1
 result=$?