diff --git a/manifest.json b/manifest.json index 95a3bd7..1b187d3 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "luckysheet", "packaging_format": 1, "description": { - "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." + "en": "Online spreadsheet that is powerful, simple to configure", + "fr": "Feuille de calcul en ligne, puissante, simple à configurer" }, "version": "2.0.0~ynh3", "url": "https://github.com/mengshukeji/Luckysheet", @@ -13,7 +13,7 @@ "name": "eric_G" }, "requirements": { - "yunohost": ">= 4.1.7" + "yunohost": ">= 4.3.0" }, "multi_instance": false, "services": [ @@ -23,8 +23,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "domain.org" + "type": "domain" }, { "name": "path", diff --git a/scripts/_common.sh b/scripts/_common.sh index 7912aa4..b818f0f 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -nodejs_version=14 +nodejs_version=16 #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index 75015f9..3f432cc 100644 --- a/scripts/install +++ b/scripts/install @@ -99,11 +99,11 @@ ynh_add_nginx_config #============================================== ynh_script_progression --message="Building Luckysheet... (this will take some time and resources!)" --weight=20 -pushd "$final_path" || ynh_die +pushd "$final_path" ynh_use_nodejs - ynh_exec_warn_less ynh_npm install - ynh_exec_warn_less ynh_npm install gulp -g -popd || ynh_die + ynh_exec_warn_less $ynh_npm install + ynh_exec_warn_less $ynh_npm install gulp -g +popd #================================================= # MODIFY A CONFIG FILE diff --git a/scripts/restore b/scripts/restore index 6649250..9e2705c 100644 --- a/scripts/restore +++ b/scripts/restore @@ -35,8 +35,6 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=2 -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path " diff --git a/scripts/upgrade b/scripts/upgrade index a418f1e..0ffd634 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -111,11 +111,11 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Building Luckysheet... (this will take some time and resources!)" --weight=20 - pushd "$final_path" || ynh_die + pushd "$final_path" ynh_use_nodejs - ynh_npm install - ynh_npm install gulp -g - popd || ynh_die + ynh_exec_warn_less $ynh_npm install + ynh_exec_warn_less $ynh_npm install gulp -g + popd fi #================================================= @@ -124,7 +124,6 @@ fi ynh_script_progression --message="Configuring a systemd service..." --weight=2 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" # Create a dedicated systemd config ynh_add_systemd_config