Merge pull request #54 from YunoHost-Apps/testing

Fix linter warning + improve readme + check_process

README.md

@@ -40,7 +40,6 @@ Have a look to the [security audit](https://defuse.ca/audits/encfs.htm) to have
 
 ## Documentation and resources
 
-* Official app website: <https://github.com/maniackcrudelis/archivist>
 * Upstream app code repository: <https://github.com/maniackcrudelis/archivist>
 * YunoHost Store: <https://apps.yunohost.org/app/archivist>
 * Report a bug: <https://github.com/YunoHost-Apps/archivist_ynh/issues>

README_fr.md

@@ -39,7 +39,6 @@ Consultez l'[audit de sécurité](https://defuse.ca/audits/encfs.htm) pour avoir
 
 ## Documentations et ressources
 
-* Site officiel de l’app : <https://github.com/maniackcrudelis/archivist>
 * Dépôt de code officiel de l’app : <https://github.com/maniackcrudelis/archivist>
 * YunoHost Store: <https://apps.yunohost.org/app/archivist>
 * Signaler un bug : <https://github.com/YunoHost-Apps/archivist_ynh/issues>

check_process

@@ -5,15 +5,6 @@
 		core_backup=1
 		apps_backup=1
 		frequency="Weekly"
-	; Config_panel
-		main.encryption.encrypt=1|0
-		main.encryption.encryption_pwd=password1|password2
-		main.backup_types.core_backup=1|0
-		main.backup_types.apps_backup=1|0
-		main.backup_options.frequency=Daily|Each 3 days|Weekly|Biweekly|Monthly
-		main.backup_options.max_size=1000
-		main.overwrite_files.overwrite_cron=1|0
-		main.global_config.email_type=1|0
 	; Checks
 		pkg_linter=1
 		setup_sub_dir=0
@@ -22,26 +13,16 @@
 		setup_private=0
 		setup_public=0
 		upgrade=1
-		upgrade=1	from_commit=2b2793737d5e1374659cbb74838d10162a2147e6
+		#upgrade=1	from_commit=2b2793737d5e1374659cbb74838d10162a2147e6
 		backup_restore=1
 		multi_instance=1
 		port_already_use=0
 		change_url=0
 		config_panel=0
-;; Test actions without encryption
-# Actions can't be tested with the encryption on, because LXC does not support fuse.
-	; Manifest
-		encrypt=0
-		encryption_pwd=""
-		core_backup=1
-		apps_backup=1
-	; Checks
-		setup_nourl=1
-		actions=1
 ;;; Options
 Email=
 Notification=change
 ;;; Upgrade options
-	; commit=2b2793737d5e1374659cbb74838d10162a2147e6
+	; #commit=2b2793737d5e1374659cbb74838d10162a2147e6
-		name=03 Nov 2017 2b2793737d5e1374659cbb74838d10162a2147e6
+		#name=03 Nov 2017 2b2793737d5e1374659cbb74838d10162a2147e6
 		manifest_arg=encrypt=1&encryption_pwd="password"&core_backup=1&apps_backup=1&frequency="Weekly"&

manifest.json

@@ -10,7 +10,6 @@
     "url": "https://github.com/maniackcrudelis/archivist",
     "upstream": {
         "license": "GPL-3.0",
-        "website": "https://github.com/maniackcrudelis/archivist",
         "code": "https://github.com/maniackcrudelis/archivist"
     },
     "license": "GPL-3.0",
@@ -71,7 +70,7 @@
             },
             {
                 "name": "frequency",
-                "type": "string",
+                "type": "select",
                 "ask": {
                     "en": "Choose the frequency of your backups?",
                     "fr": "Choississez la fréquence de votre backup ?"

scripts/install

@@ -181,9 +181,7 @@ ynh_use_logrotate
 # PRINT INFORMATION
 #=================================================
 
-Informations="
+Informations="To add recipients or to modify the files or apps to backup,please have a look to the config file $config_file"
-To add recipients or to modify the files or apps to backup,
-please have a look to the config file $config_file"
 ynh_print_info --message="$Informations"
 
 #=================================================
@@ -192,10 +190,7 @@ ynh_print_info --message="$Informations"
 
 if [ "$encrypt" = "true" ]
 then
-	encrypt_message="Your password for encryption is '$encryption_pwd'
+	encrypt_message="Your password for encryption is '$encryption_pwd'"
-
-"
-
 else
 	encrypt_message=""
 fi