From e9c60daf064d4294240f5f971b0f9bf6e6d6f0f3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 31 Dec 2020 14:37:35 +0100 Subject: [PATCH 1/3] Upgrade to 2.1.12 --- README.md | 2 +- README_fr.md | 2 +- check_process | 2 -- conf/app.src | 4 ++-- manifest.json | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 26d21c6..3575db6 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview Luckysheet is an online spreadsheet that is powerful, simple to configure, and completely open source. -**Shipped version:** 2.0.0 +**Shipped version:** 2.1.12 ## Screenshot diff --git a/README_fr.md b/README_fr.md index f603c9c..0f8c5cc 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install ## Vue d'ensemble Luckysheet est une feuille de calcul en ligne, puissante, simple à configurer et complètement open source. -**Version incluse :** 2.0.0 +**Version incluse :** 2.1.12 ## Captures d'écran diff --git a/check_process b/check_process index 65a35b3..77098f1 100644 --- a/check_process +++ b/check_process @@ -16,8 +16,6 @@ multi_instance=1 port_already_use=1 change_url=1 -;;; Levels - Level 5=auto ;;; Options Email= Notification=none diff --git a/conf/app.src b/conf/app.src index f2edea3..5e61c86 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/mengshukeji/Luckysheet/archive/v2.0.0.tar.gz -SOURCE_SUM=697e79a4d033506074f8e0261ff94cee6e4360b7f0634cb9de53ae59edcec1fe +SOURCE_URL=https://github.com/mengshukeji/Luckysheet/archive/v2.1.12.tar.gz +SOURCE_SUM=f98dea4c8ab133fc435371312eb9bdc81286fe01093540d9848e3e402c80e5fd SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index ab54092..df7bf02 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Online spreadsheet that is powerful, simple to configure, and completely open source.", "fr": "Feuille de calcul en ligne, puissante, simple à configurer et entièrement open source." }, - "version": "2.0.0~ynh1", + "version": "2.1.12~ynh1", "url": "https://github.com/mengshukeji/Luckysheet", "license": "MIT", "maintainer": { From 41acabbcce6a98301ae88c3047620ddc2404f285 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 31 Dec 2020 14:42:41 +0100 Subject: [PATCH 2/3] Fix linter warnings --- manifest.json | 2 +- scripts/_common.sh | 2 +- scripts/install | 8 ++++---- scripts/restore | 14 +++++++------- scripts/upgrade | 12 ++++++------ 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/manifest.json b/manifest.json index df7bf02..2510f5c 100644 --- a/manifest.json +++ b/manifest.json @@ -10,7 +10,7 @@ "url": "https://github.com/mengshukeji/Luckysheet", "license": "MIT", "maintainer": { - "name": "" + "name": "eric_G" }, "requirements": { "yunohost": ">= 3.8.1" diff --git a/scripts/_common.sh b/scripts/_common.sh index ac79128..7912aa4 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -nodejs_version=12 +nodejs_version=14 #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index cacaa7d..d338146 100644 --- a/scripts/install +++ b/scripts/install @@ -129,17 +129,17 @@ ynh_add_systemd_config #================================================= # SECURE FILES AND DIRECTORIES #================================================= -ynh_script_progression --message="Securing files and directories..." +ynh_script_progression --message="Securing files and directories..." --weight=1 # Set permissions to app files -chown -R $app:$app $final_path +chown -R $app: $final_path #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= -ynh_script_progression --message="Integrating service in YunoHost..." +ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description "Collaborative Markdown notes" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Online spreadsheet like excel" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/restore b/scripts/restore index a7219c5..6bc0c0f 100644 --- a/scripts/restore +++ b/scripts/restore @@ -45,14 +45,14 @@ test ! -d $final_path \ #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the NGINX configuration..." +ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # RESTORE THE APP MAIN DIR #================================================= -ynh_script_progression --message="Restoring Luckysheet main directory..." --weight=60 +ynh_script_progression --message="Restoring Luckysheet main directory..." --weight=50 ynh_restore_file --origin_path="$final_path" @@ -67,10 +67,10 @@ ynh_system_user_create --username=$app #================================================= # RESTORE USER RIGHTS #================================================= -ynh_script_progression --message="Restoring user rights..." +ynh_script_progression --message="Restoring user rights..." --weight=1 # Restore permissions on app files -chown -R $app:$app $final_path +chown -R $app: $final_path #================================================= # SPECIFIC RESTORATION @@ -88,14 +88,14 @@ ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version ynh_script_progression --message="Restoring the systemd configuration..." --weight=5 ynh_restore_file --origin_path="/etc/systemd/system/$app.service" -systemctl enable $app.service +systemctl enable $app.service --quiet #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= -ynh_script_progression --message="Integrating service in YunoHost..." +ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description "collaborative Markdown editor" --log "/var/log/$app/$app.log" +yunohost service add $app --description="Online spreadsheet like excel" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index 66b9880..8bb7200 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -32,7 +32,7 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up Luckysheet before upgrading (may take a while)..." --weight=120 +ynh_script_progression --message="Backing up Luckysheet before upgrading (may take a while)..." --weight=20 # Backup the current version of the app ynh_backup_before_upgrade @@ -58,7 +58,7 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Upgrading source files..." --weight=160 + ynh_script_progression --message="Upgrading source files..." --weight=20 # Remove the app directory securely ynh_secure_remove --file=$final_path @@ -98,7 +98,7 @@ ynh_system_user_create --username=$app #============================================== if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Building Luckysheet... (this will take some time and resources!)" --weight=160 + ynh_script_progression --message="Building Luckysheet... (this will take some time and resources!)" --weight=20 pushd "$final_path" || ynh_die @@ -124,17 +124,17 @@ ynh_add_systemd_config #================================================= # SECURE FILES AND DIRECTORIES #================================================= -ynh_script_progression --message="Securing files and directories..." +ynh_script_progression --message="Securing files and directories..." --weight=1 # Set permissions on app files -chown -R $app:$app $final_path +chown -R $app: $final_path #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description "Collaborative Markdown notes" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Online spreadsheet like excel" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE From b56e2a7ff1cb415d8dddd20abcfff191d1ed59c8 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 31 Dec 2020 14:46:11 +0100 Subject: [PATCH 3/3] Fix badges --- README.md | 4 ++-- README_fr.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 3575db6..a2b3d0e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Luckysheet for YunoHost -[![Integration level](https://dash.yunohost.org/integration/hedgedoc.svg)](https://dash.yunohost.org/appci/app/hedgedoc) ![](https://ci-apps.yunohost.org/ci/badges/hedgedoc.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/hedgedoc.maintain.svg) -[![Install Luckysheet with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=hedgedoc) +[![Integration level](https://dash.yunohost.org/integration/luckysheet.svg)](https://dash.yunohost.org/appci/app/luckysheet) ![](https://ci-apps.yunohost.org/ci/badges/luckysheet.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/luckysheet.maintain.svg) +[![Install Luckysheet with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=luckysheet) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index 0f8c5cc..6424bac 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,7 +1,7 @@ # Luckysheet pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/hedgedoc.svg)](https://dash.yunohost.org/appci/app/hedgedoc) ![](https://ci-apps.yunohost.org/ci/badges/hedgedoc.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/hedgedoc.maintain.svg) -[![Installer Luckysheet avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=hedgedoc) +[![Niveau d'intégration](https://dash.yunohost.org/integration/luckysheet.svg)](https://dash.yunohost.org/appci/app/luckysheet) ![](https://ci-apps.yunohost.org/ci/badges/luckysheet.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/luckysheet.maintain.svg) +[![Installer Luckysheet avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=luckysheet) *[Read this readme in english.](./README.md)*