From 18477d245896945e802cb98e731224cd75f3a82c Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Fri, 22 Mar 2019 21:53:06 +0100
Subject: [PATCH] roll back to admin_name and admin_pass

---
 README.md       | 2 +-
 check_process   | 4 ++--
 conf/app.src    | 4 ++--
 manifest.json   | 6 +++---
 scripts/install | 8 ++++----
 scripts/upgrade | 2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index e9c5342..e342d65 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Features :
 * Marketing tools
 * **and more**...
 
-**Shipped version:** 8.4.5
+**Shipped version:** 8.5.0
 
 ## Documentation
 
diff --git a/check_process b/check_process
index cf1c349..16ddc2e 100644
--- a/check_process
+++ b/check_process
@@ -7,10 +7,10 @@
 	; Manifest
 		domain="domain.tld"	(DOMAIN)
 		path="/path"	(PATH)
-		admin="john"   (USER)
+		admin_name="john"   (USER)
 		language="fr_FR"
 		is_public=1	(PUBLIC|public=1|private=0)
-		password="pass"
+		admin_pass="pass"
 		website_title="site"
 		
 	; Checks
diff --git a/conf/app.src b/conf/app.src
index 924e56a..ad951e1 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/concrete5/concrete5/archive/8.4.5.tar.gz
-SOURCE_SUM=a8708e6d55dba3bcf6aeb2a377eaa851650cb8634343c7ce4e88045fd58d565e
+SOURCE_URL=https://github.com/concrete5/concrete5/archive/8.5.0.tar.gz
+SOURCE_SUM=0817919036201331bd610e1e77fb83732b235ab2b6ed1f19b2312899a7929318
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index c18b9d2..3d0c058 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Create a modern Website",
         "fr": "Créer un site web moderne avec un CMS moderne"
     },
-    "version": "8.4.5~ynh1",
+    "version": "8.5.0~ynh1",
     "url": "www.concrete5.org",
     "license": "MIT",
     "maintainer": {
@@ -44,7 +44,7 @@
                 "default": "/concrete"
             },
             {
-                "name": "admin",
+                "name": "admin_name",
                 "type": "user",
                 "ask": {
                     "en": "Choose an admin user",
@@ -72,7 +72,7 @@
                 "default": "en_US"
             },
             {
-                "name": "password",
+                "name": "admin_pass",
                 "type": "password",
                 "ask": {
                     "en": "Set the administrator password",
diff --git a/scripts/install b/scripts/install
index f07a8fa..8672443 100644
--- a/scripts/install
+++ b/scripts/install
@@ -22,12 +22,12 @@ ynh_abort_if_errors
 
 domain=$YNH_APP_ARG_DOMAIN
 path_url=$YNH_APP_ARG_PATH
-admin=$YNH_APP_ARG_ADMIN
+admin_name=$YNH_APP_ARG_ADMIN_NAME
 is_public=$YNH_APP_ARG_IS_PUBLIC
 language=$YNH_APP_ARG_LANGUAGE
 password=$YNH_APP_ARG_PASSWORD
 website_title=$YNH_APP_ARG_WEBSITE_TITLE
-admin_email=$(ynh_user_get_info $admin 'mail')
+admin_email=$(ynh_user_get_info $admin_name 'mail')
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -52,7 +52,7 @@ ynh_print_info "Storing installation settings..."
 
 ynh_app_setting_set $app domain $domain
 ynh_app_setting_set $app path $path_url
-ynh_app_setting_set $app admin $admin
+ynh_app_setting_set $app admin_name $admin_name
 ynh_app_setting_set $app is_public $is_public
 ynh_app_setting_set $app language $language
 ynh_app_setting_set $app admin_email $admin_email
@@ -120,7 +120,7 @@ pushd $final_path
                                         --db-password=$db_pwd \
                                         --site="$website_title" \
                                         --admin-email="$admin_email" \
-                                        --admin-password=$password \
+                                        --admin-password="$admin_pass" \
                                         --language=$language \
                                         --site-locale=$language \
                                         --verbose \
diff --git a/scripts/upgrade b/scripts/upgrade
index 2d1fefa..acfb610 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -18,7 +18,7 @@ app=$YNH_APP_INSTANCE_NAME
 
 domain=$(ynh_app_setting_get $app domain)
 path_url=$(ynh_app_setting_get $app path)
-admin=$(ynh_app_setting_get $app admin)
+admin_name=$(ynh_app_setting_get $app admin_name)
 is_public=$(ynh_app_setting_get $app is_public)
 final_path=$(ynh_app_setting_get $app final_path)
 language=$(ynh_app_setting_get $app language)