From f811e7f37c8fd428343501f72bc1d2c3e7e44916 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Tue, 16 Jun 2020 21:52:03 +0200
Subject: [PATCH] remove bazaar

---
 README.md       |  1 -
 check_process   |  1 -
 manifest.json   | 10 ----------
 scripts/install |  7 -------
 scripts/upgrade | 10 +++++-----
 5 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index cec4440..1bf7da6 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,6 @@ Required parameters are:
 - `public`, *true* by default, for guests to read the forum
 - `title` of the forum
 - `language` can be English `en` (by default), French `fr`, and German `de`. Other languages are installable after installation like any other extensions
-- `bazaar_extension` to install the extension marketplace (*false* by default), to avoid using the command line to add new extensions.
 
 After installation, simply open your browser to Flarum's page. First loading may be a bit longer as assets are generated.
 
diff --git a/check_process b/check_process
index 9e2aadc..1663765 100644
--- a/check_process
+++ b/check_process
@@ -7,7 +7,6 @@
 		path="/path"	(PATH)
 		admin="john"	(USER)
 		title="Test flarum"
-		bazaar_extension=0
 		language="en"
 		is_public=1	(PUBLIC|public=1|private=0)
 	; Checks
diff --git a/manifest.json b/manifest.json
index 9616652..7a70155 100644
--- a/manifest.json
+++ b/manifest.json
@@ -89,16 +89,6 @@
                 },
                 "default": true
             },
-            {
-                "name": "bazaar_extension",
-                "type": "boolean",
-                "ask": {
-                    "en": "Do you want to install Bazaar extension, extensions provider for Flarum?",
-                    "fr": "Voulez-vous installer l'extension Bazaar, fournisseur d'extensions pour Flarum ?",
-                    "de": "Wollen Sie die Bazaar Erweiterung installieren ?"
-                },
-                "default": false
-            },
             {
                 "name": "language",
                 "type": "string",
diff --git a/scripts/install b/scripts/install
index 1079341..26d598c 100644
--- a/scripts/install
+++ b/scripts/install
@@ -34,7 +34,6 @@ admin=$YNH_APP_ARG_ADMIN
 is_public=$YNH_APP_ARG_IS_PUBLIC
 language=$YNH_APP_ARG_LANGUAGE
 title=$YNH_APP_ARG_TITLE
-bazaar_extension=$YNH_APP_ARG_BAZAAR_EXTENSION
 
 admin_pwd=$(ynh_string_random --length=8)
 admin_mail=$(ynh_user_get_info --username=$admin --key=mail)
@@ -65,7 +64,6 @@ ynh_app_setting_set --app=$app --key=language --value=$language
 ynh_app_setting_set --app=$app --key=project_version --value=$project_version
 ynh_app_setting_set --app=$app --key=core_version --value=$core_version
 ynh_app_setting_set --app=$app --key=ssowat_version --value=$ssowat_version
-ynh_app_setting_set --app=$app --key=bazaar_extension --value=$bazaar_extension
 
 #=================================================
 # STANDARD MODIFICATIONS
@@ -217,11 +215,6 @@ case $language in
     ;;
 esac
 
-if [ $bazaar_extension -eq 1 ]; then
-  ynh_script_progression --message="Installing Bazaar extension..." --weight=2
-  ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands="require extiverse/bazaar"
-fi
-
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 47f440b..e7d12c7 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -94,6 +94,11 @@ fi
 # Remove the v before version number
 if [[ $old_project_version == "v*" ]]; then $old_project_version = ${old_project_version:1}; fi
 
+# Remove bazaar_extension if exists
+if [ ! -z "$bazaar_extension" ]; then
+	ynh_app_setting_delete --app=$app --key=bazaar_extension
+fi
+
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================
@@ -257,11 +262,6 @@ case $language in
 esac
 ynh_print_info "You may need to manually enable your language extension in Flarum's admin panel."
 
-if [ $bazaar_extension -eq 1 ]; then
-  ynh_script_progression --message="Installing Bazaar extension..." --weight=2
-  ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands="require extiverse/bazaar"
-fi
-
 # Clear cache
 pushd $final_path
 	exec_as $app php$phpversion flarum cache:clear