From 1f0926c8ac026466cdd191c1e55ae25dc7d77d94 Mon Sep 17 00:00:00 2001 From: Ackak Date: Sat, 9 May 2015 00:14:42 +0200 Subject: [PATCH 1/2] =?UTF-8?q?Changement=20car=20certaines=20commandes=20?= =?UTF-8?q?yunohost=20ont=20chang=C3=A9es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/user_list.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/user_list.py b/conf/user_list.py index 52994aa..a253599 100644 --- a/conf/user_list.py +++ b/conf/user_list.py @@ -1,3 +1,3 @@ import sys, json -userlist=json.loads(sys.stdin.readlines()[0])["Users"] -print "{0}".format("\n".join(i["Username"] for i in userlist)) +userlist=json.loads(sys.stdin.readlines()[0])["users"] +print "{0}".format("\n".join(i["username"] for i in userlist)) From 849c36fe0a10397db495640c05182a7c1cd01e0a Mon Sep 17 00:00:00 2001 From: Ackak Date: Sat, 9 May 2015 00:15:36 +0200 Subject: [PATCH 2/2] Ajout de l'option json --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index eb0976b..a001536 100644 --- a/scripts/install +++ b/scripts/install @@ -52,7 +52,7 @@ sudo sed -i "s@YNH_ADMIN@$admin@g" ../conf/init_config.php sudo cp ../conf/options.php $app_home_path/data/options.php sudo cp ../conf/init_config.php $app_home_path/data/config.php -sudo php ../conf/init_config_user.php $(sudo yunohost user list | python ../conf/user_list.py) +sudo php ../conf/init_config_user.php $(sudo yunohost user list --json | python ../conf/user_list.py) sudo find $final_path -type f | xargs sudo chmod 644 sudo find $final_path -type d | xargs sudo chmod 755