From 962973663e30a86ea760cdee1bb0560985f6d5d8 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@gmail.com>
Date: Wed, 2 Jul 2014 16:15:07 +0200
Subject: [PATCH] fix install for new moulinette API

---
 conf/user_getmail.py | 6 +++---
 conf/user_getname.py | 6 +++---
 scripts/install      | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/conf/user_getmail.py b/conf/user_getmail.py
index 1930a7f..fb7d13b 100644
--- a/conf/user_getmail.py
+++ b/conf/user_getmail.py
@@ -1,4 +1,4 @@
 import sys, json
-for i in json.loads(sys.stdin.readlines()[0])["Users"]:
-  if i["Username"] == sys.argv[1]:
-    print i["Mail"]
\ No newline at end of file
+for i in json.loads(sys.stdin.readlines()[0])["users"]:
+  if i["username"] == sys.argv[1]:
+    print i["mail"]
diff --git a/conf/user_getname.py b/conf/user_getname.py
index 852371b..2f59f76 100644
--- a/conf/user_getname.py
+++ b/conf/user_getname.py
@@ -1,4 +1,4 @@
 import sys, json
-for i in json.loads(sys.stdin.readlines()[0])["Users"]:
-  if i["Username"] == sys.argv[1]:
-    print i["Fullname"]
\ No newline at end of file
+for i in json.loads(sys.stdin.readlines()[0])["users"]:
+  if i["username"] == sys.argv[1]:
+    print i["fullname"]
diff --git a/scripts/install b/scripts/install
index 7f18f93..51954b0 100644
--- a/scripts/install
+++ b/scripts/install
@@ -124,8 +124,8 @@ sudo yunohost app ssowatconf
 
 echo "Registering admin..."
 sleep 5
-admin_name=$(sudo yunohost user list | python ../conf/user_getname.py $admin)
-admin_mail=$(sudo yunohost user list | python ../conf/user_getmail.py $admin)
+admin_name=$(sudo yunohost user list --json | python ../conf/user_getname.py $admin)
+admin_mail=$(sudo yunohost user list --json | python ../conf/user_getmail.py $admin)
 curl -kL -X GET https://$domain${path%/}/ghost/signup --cookie-jar cookie.txt > signup_get
 sleep 5
 csrf_token=$(cat signup_get | egrep csrf-param | egrep "content=\".+\"" -o | egrep "\".+\"" -o | cut -d '"' -f 2)