diff --git a/manifest.json b/manifest.json index 4b60359..4e9154f 100644 --- a/manifest.json +++ b/manifest.json @@ -32,9 +32,17 @@ { "name": "admin", "ask": { - "en": "Choose an admin user" + "en": "Admin login" }, - "example": "johndoe" + "example": "galette_admin", + "default": "galette_admin" + }, + { + "name": "adminPass", + "ask": { + "en": "Admin password" + }, + "example": "" }, { "name": "is_public", diff --git a/scripts/install b/scripts/install index 4c2563e..cde0956 100755 --- a/scripts/install +++ b/scripts/install @@ -10,7 +10,8 @@ version=0.8.2 domain=$1 path=$2 admin=$3 -is_public=$4 +adminPass=$4 +is_public=$5 #################################################### # Check domain / path availability # @@ -105,15 +106,12 @@ sudo yunohost app ssowatconf #################################################### # Install mechanize to have a browser in a python script - sudo pip install mechanize # Then call python script to fill galette php installer with the right info - -# todo : replace last password by user-specified pass -sudo python initialConf.py $domain$path $db_pwd $admin $db_pwd +sudo python initialConf.py $domain$path $db_pwd $admin $adminPass # Delete the install folder as advised by galette php installer -#sudo rm -rf $final_path/install +sudo rm -rf $final_path/install