From 985972e3b19c4847bb6799382a7536734bb966eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Tue, 17 Nov 2020 23:27:31 +0100 Subject: [PATCH 1/2] Fix package linter error --- check_process | 11 ----------- scripts/backup | 8 ++++---- scripts/change_url | 8 ++++---- scripts/install | 8 ++++---- scripts/remove | 6 +++--- scripts/restore | 8 ++++---- scripts/upgrade | 8 ++++---- 7 files changed, 23 insertions(+), 34 deletions(-) diff --git a/check_process b/check_process index 9159488..1820ca8 100644 --- a/check_process +++ b/check_process @@ -25,17 +25,6 @@ port_already_use=0 (XXXX) final_path_already_use=1 change_url=1 -;;; Levels - Level 1=auto - Level 2=auto - Level 3=auto - Level 4=1 - Level 5=auto - Level 6=auto - Level 7=auto - Level 8=0 - Level 9=0 - Level 10=0 ;;; Upgrade options ; commit=f39b77ae010dc6ed197b4b8e92110bede6ed4e07 name=Before sso Support and refactoring diff --git a/scripts/backup b/scripts/backup index 3a08d8b..9b7d322 100644 --- a/scripts/backup +++ b/scripts/backup @@ -4,16 +4,16 @@ # GENERIC START #================================================= +# Import common cmd +source ../settings/scripts/experimental_helper.sh +source ../settings/scripts/_common.sh + # Source YunoHost helpers source /usr/share/yunohost/helpers # Stop script if errors ynh_abort_if_errors -# Import common cmd -source ../settings/scripts/experimental_helper.sh -source ../settings/scripts/_common.sh - #================================================= # STANDARD BACKUP STEPS #================================================= diff --git a/scripts/change_url b/scripts/change_url index d041fb6..3a95905 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -4,16 +4,16 @@ # GENERIC START #================================================= +# Import common cmd +source ./experimental_helper.sh +source ./_common.sh + # Source YunoHost helpers source /usr/share/yunohost/helpers # Stop script if errors ynh_abort_if_errors -# Import common cmd -source ./experimental_helper.sh -source ./_common.sh - # Retrive arguments ynh_script_progression --message="Loading installation settings..." old_domain=$YNH_APP_OLD_DOMAIN diff --git a/scripts/install b/scripts/install index 218b7c2..9869adb 100644 --- a/scripts/install +++ b/scripts/install @@ -4,16 +4,16 @@ # GENERIC START #================================================= +# Import common cmd +source ./experimental_helper.sh +source ./_common.sh + # Source YunoHost helpers source /usr/share/yunohost/helpers # Stop script if errors ynh_abort_if_errors -# Import common cmd -source ./experimental_helper.sh -source ./_common.sh - ynh_script_progression --message="Validating installation parameters..." # Retrieve arguments diff --git a/scripts/remove b/scripts/remove index 9eb0514..ea3e66d 100755 --- a/scripts/remove +++ b/scripts/remove @@ -4,13 +4,13 @@ # GENERIC START #================================================= -# Source YunoHost helpers -source /usr/share/yunohost/helpers - # Import common cmd source ./experimental_helper.sh source ./_common.sh +# Source YunoHost helpers +source /usr/share/yunohost/helpers + #================================================= # STANDARD REMOVE #================================================= diff --git a/scripts/restore b/scripts/restore index 501b708..47c7be4 100644 --- a/scripts/restore +++ b/scripts/restore @@ -4,16 +4,16 @@ # GENERIC START #================================================= +# Import common cmd +source ../settings/scripts/experimental_helper.sh +source ../settings/scripts/_common.sh + # Source YunoHost helpers source /usr/share/yunohost/helpers # Stop script if errors ynh_abort_if_errors -# Import common cmd -source ../settings/scripts/experimental_helper.sh -source ../settings/scripts/_common.sh - # Retrieve arguments ynh_script_progression --message="Loading settings..." domain=$(ynh_app_setting_get --app $app --key domain) diff --git a/scripts/upgrade b/scripts/upgrade index 96d80cc..7bf9fe0 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -4,16 +4,16 @@ # GENERIC START #================================================= +# Import common cmd +source ./experimental_helper.sh +source ./_common.sh + # Source YunoHost helpers source /usr/share/yunohost/helpers # Stop script if errors ynh_abort_if_errors -# Import common cmd -source ./experimental_helper.sh -source ./_common.sh - # Retrieve arguments ynh_script_progression --message="Loading installation settings..." domain=$(ynh_app_setting_get --app $app --key domain) From 01855f51f82da2ef19a70a3babb57b4bc2edb3ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Mon, 23 Nov 2020 21:03:24 +0000 Subject: [PATCH 2/2] Upgrade element to 1.7.14 --- README.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index a94ce01..3a7c756 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ It's a webclient for matrix. For a matrix server you can install synapse on your Yunohost chattroom with matrix : [https://app.element.io/#/room/#yunohost:matrix.org](https://app.element.io/#/room/#yunohost:matrix.org) -**Shipped version:** 1.7.13 +**Shipped version:** 1.7.14 Screenshots ----------- diff --git a/conf/app.src b/conf/app.src index 34008cf..4242dd0 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/vector-im/element-web/releases/download/v1.7.13/riot-v1.7.13.tar.gz -SOURCE_SUM=c32f27e3122ed7f715914ffca719c55bd38e2f30304e83eebe37cf19b2ffd48f +SOURCE_URL=https://github.com/vector-im/element-web/releases/download/v1.7.14/riot-v1.7.14.tar.gz +SOURCE_SUM=1288b813617da629de68fb1ed5e5f70514f3af8cabfe22dcd48cd606a20ed3f3 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/manifest.json b/manifest.json index 0a438b5..f0068c7 100644 --- a/manifest.json +++ b/manifest.json @@ -9,7 +9,7 @@ "en": "A web client for matrix", "fr": "Un client web pour matrix" }, - "version": "1.7.13~ynh1", + "version": "1.7.14~ynh1", "url": "https://element.im", "license": "Apache-2.0", "maintainer": {