Merge pull request #29 from YunoHost-Apps/testing

Testing

check_process

@@ -1,62 +1,18 @@
 ;; Test complet
+	; pre-install
+		sudo yunohost app install my_webapp -a domain=domain.tld&path=/site&admin=john&is_public=1&password=pass
 	; Manifest
 		domain="domain.tld"	(DOMAIN)
 		app_id="my_webapp"	(APP_ID)
 	; Checks
 		pkg_linter=1
-		setup_sub_dir=1
+		setup_sub_dir=0
 		setup_root=1
 		setup_nourl=0
-		setup_private=1
-		setup_public=1
-		upgrade=1
-		upgrade=1	from_commit=CommitHash
-		backup_restore=1
-		multi_instance=1
-		port_already_use=0
-		change_url=1
-;;; Options
-Email=
-Notification=none
-;;; Upgrade options
-	; commit=CommitHash
-		name=Name and date of the commit.
-		manifest_arg=domain=DOMAIN&path=PATH&admin=APP_ID&
-
-;; Default test serie
-# Comment ignored
-	; pre-install
-		sudo yunohost app install my_webapp -a domain=domain.tld&path=/site&admin=john&is_public=1&password=pass
-	; Manifest
-        # You need to provide default values for installation parameters ...
-        # EXCEPT for special args: domain, path, admin, and is_public 
-        # which will be filled automatically during tests
-		language=""
-		password=""
-		port=""
-	; Actions
-		is_public=1
-	; Config_panel
-		main.categorie.config_example=none
-		main.overwrite_files.overwrite_phpfpm=none
-		main.php_fpm_config.footprint=none
-		main.php_fpm_config.free_footprint=none
-		main.php_fpm_config.usage=none
-	; Checks
-		pkg_linter=1
-		setup_sub_dir=1
-		setup_root=0
-		setup_nourl=0
 		setup_private=0
+		setup_public=0
 		upgrade=1
-		upgrade=1	from_commit=65c382d138596fcb32b4c97c39398815a1dcd4e8
 		backup_restore=1
 		multi_instance=0
-		port_already_use=0	(66)
+		port_already_use=0
-		change_url=0
+		change_url=1
-		actions=0
-		config_panel=0
-;;; Upgrade options
-	; commit=65c382d138596fcb32b4c97c39398815a1dcd4e8
-		name=Name of this previous version
-		manifest_arg=domain=DOMAIN&app_id=APP_ID&

manifest.json

@@ -6,13 +6,12 @@
         "en": "Code editor awesomeness... in your browser",
         "fr": "Un éditeur de code impressionnant... dans votre navigateur"
     },
-    "version": "2.0.0~ynh1",
+    "version": "2.0.1~ynh1",
-    "url": "https://icecoder.net/",
+    "url": "https://icecoder.net",
     "license": "AGPL-3.0-only",
     "maintainer": {
         "name": "Stylix58",
-        "email": "lateman-jpeg@outlook.fr",
+        "email": "lateman-jpeg@outlook.fr"
-        "url": "https://stylix58.netlify.app/"
     },
     "requirements": {
         "yunohost": ">= 4.1.3"
@@ -24,11 +23,6 @@
     ],
     "arguments": {
         "install" : [
-            {
-                "name": "domain",
-                "type": "domain",
-                "example": "example.com"
-            },
             {
                 "name": "app_id",
                 "type": "string",
@@ -38,7 +32,7 @@
                 },
                 "help": {
                     "en": "You can get the ID in Custom Webapp's settings.",
-                    "fr": "Vous pouvez obtenir l'ID dans les paramètres de la Webapp personnalisée."
+                    "fr": "Vous pouvez obtenir l'ID dans les paramètres de la Custom Webapp."
                 }
             }
         ]

scripts/install

@@ -20,7 +20,6 @@ ynh_abort_if_errors
 # RETRIEVE ARGUMENTS FROM THE MANIFEST
 #=================================================
 
-domain=$YNH_APP_ARG_DOMAIN
 app_id=$YNH_APP_ARG_APP_ID
 path_url="/in-$app_id-folder"
 
@@ -65,7 +64,7 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
 #=================================================
 ynh_script_progression --message="Storing installation settings..."  --weight=1
 
-ynh_app_setting_set --app=$app --key=domain --value=$domain
+ynh_app_setting_set --app=$app --key=domain --value=none.ynh.fr
 ynh_app_setting_set --app=$app --key=path --value=$path_url
 ynh_app_setting_set --app=$app --key=app_id --value=$app_id
 
@@ -82,8 +81,6 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$final_path"
 
-#=================================================
-
 #=================================================
 # GENERIC FINALIZATION
 #=================================================