Merge pull request #102 from YunoHost-Apps/testing

Testing

ALL_README.md

@@ -1,7 +1,7 @@
 # All available README files by language
 
 - [Read the README in English](README.md)
-- [Lee el README en español](README_es.md)
+- [Lea el README en español](README_es.md)
 - [Irakurri README euskaraz](README_eu.md)
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)

README.md

@@ -33,7 +33,7 @@ Paperless-ngx is a document management system that transforms your physical docu
 * [More screenshots are available in the documentation](https://paperless-ngx.readthedocs.io/en/latest/screenshots.html).
 
 
-**Shipped version:** 2.8.6~ynh1
+**Shipped version:** 2.9.0~ynh1
 
 **Demo:** <https://demo.paperless-ngx.com/>
 

README_es.md

@@ -33,7 +33,7 @@ Paperless-ngx is a document management system that transforms your physical docu
 * [More screenshots are available in the documentation](https://paperless-ngx.readthedocs.io/en/latest/screenshots.html).
 
 
-**Versión actual:** 2.8.6~ynh1
+**Versión actual:** 2.9.0~ynh1
 
 **Demo:** <https://demo.paperless-ngx.com/>
 

README_eu.md

@@ -33,7 +33,7 @@ Paperless-ngx is a document management system that transforms your physical docu
 * [More screenshots are available in the documentation](https://paperless-ngx.readthedocs.io/en/latest/screenshots.html).
 
 
-**Paketatutako bertsioa:** 2.8.6~ynh1
+**Paketatutako bertsioa:** 2.9.0~ynh1
 
 **Demoa:** <https://demo.paperless-ngx.com/>
 

README_fr.md

@@ -33,7 +33,7 @@ Paperless-ngx is a document management system that transforms your physical docu
 * [More screenshots are available in the documentation](https://paperless-ngx.readthedocs.io/en/latest/screenshots.html).
 
 
-**Version incluse :** 2.8.6~ynh1
+**Version incluse :** 2.9.0~ynh1
 
 **Démo :** <https://demo.paperless-ngx.com/>
 

README_gl.md

@@ -33,7 +33,7 @@ Paperless-ngx is a document management system that transforms your physical docu
 * [More screenshots are available in the documentation](https://paperless-ngx.readthedocs.io/en/latest/screenshots.html).
 
 
-**Versión proporcionada:** 2.8.6~ynh1
+**Versión proporcionada:** 2.9.0~ynh1
 
 **Demo:** <https://demo.paperless-ngx.com/>
 

README_zh_Hans.md

@@ -33,7 +33,7 @@ Paperless-ngx is a document management system that transforms your physical docu
 * [More screenshots are available in the documentation](https://paperless-ngx.readthedocs.io/en/latest/screenshots.html).
 
 
-**分发版本：** 2.8.6~ynh1
+**分发版本：** 2.9.0~ynh1
 
 **演示：** <https://demo.paperless-ngx.com/>
 

manifest.toml

@@ -5,7 +5,7 @@ name = "Paperless-ngx"
 description.en = "Scan, index and archive all your physical documents"
 description.fr = "Scannez, triez et archivez tous vos documents papiers"
 
-version = "2.8.6~ynh1"
+version = "2.9.0~ynh1"
 
 maintainers = ["Tagada"]
 
@@ -16,7 +16,6 @@ demo = "https://demo.paperless-ngx.com/"
 admindoc = "https://paperless-ngx.readthedocs.io/en/latest/index.html"
 userdoc = "https://paperless-ngx.readthedocs.io/en/latest/usage_overview.html"
 code = "https://github.com/paperless-ngx/paperless-ngx"
-cpe = "???" # XXX: No CPE yet... check https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=paperless
 
 [integration]
 yunohost = ">= 11.2.12"
@@ -30,11 +29,9 @@ ram.runtime = "350M"
 
 [install]
     [install.domain]
-    # this is a generic question - ask strings are automatically handled by Yunohost's core
     type = "domain"
 
     [install.admin]
-    # this is a generic question - ask strings are automatically handled by Yunohost's core
     type = "user"
 
     [install.admin_pw]
@@ -54,8 +51,8 @@ ram.runtime = "350M"
     [resources.sources]
 
         [resources.sources.main]
-        url = "https://github.com/paperless-ngx/paperless-ngx/releases/download/v2.8.6/paperless-ngx-v2.8.6.tar.xz"
+        url = "https://github.com/paperless-ngx/paperless-ngx/releases/download/v2.9.0/paperless-ngx-v2.9.0.tar.xz"
-        sha256 = "e7f144f6357daa372e0b5e5a5f2ec9ebf80e473a65e44ee7cc15529c8687b4f4"
+        sha256 = "e5acf5c0213bbe3c93de7ce02867bd9adb0d02dcf7e11b40d1fe05d162d62d13"
 
         autoupdate.strategy = "latest_github_release"
         autoupdate.asset = "paperless-ngx-.*.tar.xz"

scripts/backup

@@ -15,11 +15,6 @@ source /usr/share/yunohost/helpers
 #=================================================
 ynh_print_info --message="Declaring files to be backed up..."
 
-### N.B. : the following 'ynh_backup' calls are only a *declaration* of what needs
-### to be backuped and not an actual copy of any file. The actual backup that
-### creates and fill the archive with the files happens in the core after this
-### script is called. Hence ynh_backups calls takes basically 0 seconds to run.
-
 #=================================================
 # BACKUP THE APP MAIN DIR
 #=================================================
@@ -62,20 +57,11 @@ ynh_backup --src_path="/etc/systemd/system/$app-consumer.service"
 ynh_backup --src_path="/etc/systemd/system/$app-scheduler.service"
 ynh_backup --src_path="/etc/systemd/system/$app-task-queue.service"
 
-#=================================================
-# BACKUP VARIOUS FILES
-#=================================================
-
-#ynh_backup --src_path="/etc/$app/"
-
 #=================================================
 # BACKUP THE MYSQL DATABASE
 #=================================================
 ynh_print_info --message="Backing up the MySQL database..."
 
-### (However, things like MySQL dumps *do* take some time to run, though the
-### copy of the generated dump to the archive still happens later)
-
 ynh_psql_dump_db --database="$db_name" > db.sql
 
 #=================================================

scripts/restore

@@ -18,10 +18,6 @@ ynh_script_progression --message="Loading additionnal settings..." --weight=1
 redis_db=$(ynh_redis_get_free_db)
 ynh_app_setting_set --app=$app --key=redis_db --value=$redis_db
 
-#=================================================
-# STANDARD RESTORATION STEPS
-#=================================================
-
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================

scripts/upgrade

@@ -9,11 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# CHECK VERSION
-#=================================================
-upgrade_type=$(ynh_check_app_version_changed)
-
 #=================================================
 # STANDARD UPGRADE STEPS
 #=================================================
@@ -47,13 +42,9 @@ fi
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
+ynh_script_progression --message="Upgrading source files..." --weight=1
 
-if [ "$upgrade_type" == "UPGRADE_APP" ]
+ynh_setup_source --dest_dir="$install_dir" --keep="paperless.conf"
-then
-	ynh_script_progression --message="Upgrading source files..." --weight=1
-
-	ynh_setup_source --dest_dir="$install_dir" --keep="paperless.conf"
-fi
 
 chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"
@@ -72,7 +63,7 @@ ynh_add_nginx_config
 #=================================================
 # INSTALL PYTHON DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Installing Python dependencies..."
+ynh_script_progression --message="Installing Python dependencies..." --weight=5
 
 pushd $install_dir
 	python3 -m venv venv