diff --git a/README.md b/README.md index 4ad69e6..3f04727 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.1.13 +**Shipped version:** 2.0.0 ## Screenshot @@ -37,8 +37,8 @@ Luckysheet is an online spreadsheet that is powerful, simple to configure, and c #### Supported architectures -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/luckysheet%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/luckysheet/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/luckysheet%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/luckysheet/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/luckysheet.svg)](https://ci-apps.yunohost.org/ci/apps/luckysheet/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/luckysheet.svg)](https://ci-apps-arm.yunohost.org/ci/apps/luckysheet/) ## Links diff --git a/README_fr.md b/README_fr.md index c5e5837..6d01d10 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.1.13 +**Version incluse :** 2.0.0 ## Captures d'écran @@ -38,8 +38,8 @@ Luckysheet est une feuille de calcul en ligne, puissante, simple à configurer e #### Architectures supportées -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/luckysheet%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/luckysheet/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/luckysheet%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/luckysheet/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/luckysheet.svg)](https://ci-apps.yunohost.org/ci/apps/luckysheet/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/luckysheet.svg)](https://ci-apps-arm.yunohost.org/ci/apps/luckysheet/) ## Liens diff --git a/check_process b/check_process index 77098f1..a4c049e 100644 --- a/check_process +++ b/check_process @@ -13,7 +13,7 @@ setup_public=1 upgrade=1 backup_restore=1 - multi_instance=1 + multi_instance=0 port_already_use=1 change_url=1 ;;; Options diff --git a/conf/app.src b/conf/app.src index 879fb55..f2edea3 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/mengshukeji/Luckysheet/archive/v2.1.13.tar.gz -SOURCE_SUM=9c996e1e2a47ca0bb37b17840f7ded82ed999899daf3bd620b07c154b71647f9 +SOURCE_URL=https://github.com/mengshukeji/Luckysheet/archive/v2.0.0.tar.gz +SOURCE_SUM=697e79a4d033506074f8e0261ff94cee6e4360b7f0634cb9de53ae59edcec1fe SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index b7e1c47..95a3bd7 100644 --- a/manifest.json +++ b/manifest.json @@ -6,16 +6,16 @@ "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.1.13~ynh1", + "version": "2.0.0~ynh3", "url": "https://github.com/mengshukeji/Luckysheet", "license": "MIT", "maintainer": { "name": "eric_G" }, "requirements": { - "yunohost": ">= 3.8.1" + "yunohost": ">= 4.1.7" }, - "multi_instance": true, + "multi_instance": false, "services": [ "nginx" ], @@ -24,29 +24,17 @@ { "name": "domain", "type": "domain", - "ask": { - "en": "Choose a domain name for Luckysheet", - "fr": "Choisissez un nom de domaine pour Luckysheet" - }, "example": "domain.org" }, { "name": "path", "type": "path", - "ask": { - "en": "Choose a path for Luckysheet", - "fr": "Choisissez un chemin pour Luckysheet" - }, "example": "/luckysheet", "default": "/luckysheet" }, { "name": "is_public", "type": "boolean", - "ask": { - "en": "Is it a public site?", - "fr": "Est-ce un site public ?" - }, "help": { "en": "If enabled, Luckysheet will be accessible by people who do not have an account. This can be changed later via the webadmin.", "fr": "Si cette case est cochée, Luckysheet sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." diff --git a/pull_request_template.md b/pull_request_template.md index 69ce5a0..6c28fc5 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -10,3 +10,7 @@ - [ ] Fix or enhancement tested. - [ ] Upgrade from last version tested. - [ ] Can be reviewed and tested. + +## Package_check results +--- +* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"* diff --git a/scripts/install b/scripts/install index 6a021eb..fd8f833 100644 --- a/scripts/install +++ b/scripts/install @@ -47,7 +47,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=2 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url -ynh_app_setting_set --app=$app --key=is_public --value=$is_public #================================================= # STANDARD MODIFICATIONS @@ -119,8 +118,8 @@ cp ../conf/config.example.js $final_path/src/config.js #================================================= ynh_script_progression --message="Configuring a systemd service..." --weight=1 -ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$PATH" --target_file="../conf/systemd.service" -ynh_replace_string --match_string="__YNH_NPM__" --replace_string="$ynh_npm" --target_file="../conf/systemd.service" +ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$PATH" --target_file="../conf/systemd.service" +ynh_replace_string --match_string="__YNH_NPM__" --replace_string="$ynh_npm" --target_file="../conf/systemd.service" ynh_add_systemd_config @@ -147,17 +146,17 @@ yunohost service add $app --description="Online spreadsheet like excel" --log="/ ynh_script_progression --message="Starting a systemd service..." --weight=2 # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Serving files from: dist" +ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="Serving files from: dist" #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring SSOwat..." --weight=1 +ynh_script_progression --message="Configuring permissions..." --weight=1 # Make app public if necessary or protect it if [ $is_public -eq 1 ] then - ynh_permission_update --permission "main" --add "visitors" + ynh_permission_update --permission="main" --add="visitors" fi #================================================= diff --git a/scripts/restore b/scripts/restore index 6bc0c0f..6649250 100644 --- a/scripts/restore +++ b/scripts/restore @@ -102,7 +102,7 @@ yunohost service add $app --description="Online spreadsheet like excel" --log="/ #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Serving files from: dist" +ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="Serving files from: dist" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 8bb7200..1c4996b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -18,7 +18,6 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) -is_public=$(ynh_app_setting_get --app=$app --key=is_public) final_path=$(ynh_app_setting_get --app=$app --key=final_path) port=$(ynh_app_setting_get --app=$app --key=port) @@ -29,6 +28,18 @@ ynh_script_progression --message="Checking version..." upgrade_type=$(ynh_check_app_version_changed) +#================================================= +# ENSURE DOWNWARD COMPATIBILITY +#================================================= +ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 + +# Cleaning legacy permissions +if ynh_legacy_permissions_exists; then + ynh_legacy_permissions_delete_all + + ynh_app_setting_delete --app=$app --key=is_public +fi + #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= @@ -50,7 +61,7 @@ ynh_abort_if_errors #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" +ynh_systemd_action --service_name=$app --action=stop --log_path=systemd #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -141,7 +152,7 @@ yunohost service add $app --description="Online spreadsheet like excel" --log="/ #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Serving files from: dist" +ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="Serving files from: dist" #================================================= # RELOAD NGINX