2
0
Переглянути джерело

Merge pull request #57 from YunoHost-Apps/testing

Merge testing to new app packaging
lapineige 1 рік тому
батько
коміт
7cc56d20cc
5 змінених файлів з 9 додано та 10 видалено
  1. 1 1
      README.md
  2. 1 1
      README_fr.md
  3. 0 1
      config_panel.toml
  4. 2 2
      manifest.json
  5. 5 5
      scripts/config

+ 1 - 1
README.md

@@ -24,7 +24,7 @@ Archivist is automatically launched periodicaly to update your backups and send
 
 
 
-**Shipped version:** 1.3.3~ynh1
+**Shipped version:** 1.3.4~ynh1
 ## Disclaimers / important information
 
 ## Configuration

+ 1 - 1
README_fr.md

@@ -23,7 +23,7 @@ Vos sauvegardes peuvent être envoyées à de nombreux autres endroits, locaux o
 Archivist est automatiquement lancé périodiquement pour mettre à jour vos sauvegardes et envoyer les modifications aux autres emplacements.
 
 
-**Version incluse :** 1.3.3~ynh1
+**Version incluse :** 1.3.4~ynh1
 ## Avertissements / informations importantes
 
 ## Configuration

+ 0 - 1
config_panel.toml

@@ -1,5 +1,4 @@
 version = "1.0"
-name = "Archivist configuration panel"
 
 [main]
 name = "Archivist configuration"

+ 2 - 2
manifest.json

@@ -6,7 +6,7 @@
         "en": "Automatic backups",
         "fr": "Sauvegardes automatiques"
     },
-    "version": "1.3.3~ynh1",
+    "version": "1.3.4~ynh1",
     "url": "https://github.com/maniackcrudelis/archivist",
     "upstream": {
         "license": "GPL-3.0",
@@ -22,7 +22,7 @@
         "email": "maniackc_dev@crudelis.fr"
     }],
     "requirements": {
-        "yunohost": ">= 4.3.0"
+        "yunohost": ">= 11.2.9"
     },
     "multi_instance": true,
     "services": [],

+ 5 - 5
scripts/config

@@ -64,9 +64,9 @@ ynh_core_backup="${YNH_CONFIG_MAIN_BACKUP_TYPES_CORE_BACKUP:-$old_ynh_core_backu
 # ynh_app_backup
 if [ -n "$(get_config_value ynh_app_backup)" ]
 then
-    old_ynh_app_backup="1"
+    old_ynh_app_backup=true
 else
-    old_ynh_app_backup="0"
+    old_ynh_app_backup=false
 fi
 ynh_app_backup="${YNH_CONFIG_MAIN_BACKUP_TYPES_APPS_BACKUP:-$old_ynh_app_backup}"
 
@@ -122,7 +122,7 @@ apply_config() {
     #=================================================
 
     # Change the password if needed
-    if [ "$encrypt" = "1" ]
+    if [ "$encrypt" ]
     then
         ynh_print_OFF
         test -n "$encrypt_password" || ynh_die --message="The password for encryption can't be empty if you choose to enable encryption."
@@ -180,7 +180,7 @@ apply_config() {
     ynh_replace_string --match_string="^ynh_core_backup=.*" --replace_string="ynh_core_backup=$ynh_core_backup" --target_file="$config_file"
 
     # Change ynh_app_backup in the config file
-    if [ "$ynh_app_backup" = "1" ] && [ "$old_ynh_app_backup" = "0" ]
+    if [ "$ynh_app_backup" = true ] && [ "$old_ynh_app_backup" = false ]
     then
         # If ynh_app_backup changed from false to true.
         # Add all current applications to the backup
@@ -189,7 +189,7 @@ apply_config() {
             ynh_print_info --message="Add a backup for the app $backup_app."
             ynh_replace_string --match_string="^ynh_app_backup=$" --replace_string="ynh_app_backup=$backup_app\n&" --target_file="$config_file"
         done <<< "$(yunohost app list -i | grep id: | sed 's/.*id: //')"
-    elif [ "$ynh_app_backup" = "0" ] && [ "$old_ynh_app_backup" = "1" ]
+    elif [ "$ynh_app_backup" = false ] && [ "$old_ynh_app_backup" = true ]
     then
         # Remove all app currently backup
         # By deleting all line starting by 'ynh_app_backup=' and having something after '='