From e381055bd0e6b6b862bdbec72945ec589d8128d7 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sat, 27 Nov 2021 08:58:52 +0100
Subject: [PATCH] Fix ynh_npm helper

---
 manifest.json   |  9 ++++-----
 scripts/install |  4 ++--
 scripts/restore |  5 +----
 scripts/upgrade | 11 +++++------
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/manifest.json b/manifest.json
index 95a3bd7..5d65180 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,10 +3,10 @@
     "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",
+    "version": "2.0.0~ynh4",
     "url": "https://github.com/mengshukeji/Luckysheet",
     "license": "MIT",
     "maintainer": {
@@ -23,8 +23,7 @@
         "install" : [
             {
                 "name": "domain",
-                "type": "domain",
-                "example": "domain.org"
+                "type": "domain"
             },
             {
                 "name": "path",
diff --git a/scripts/install b/scripts/install
index fd8f833..9ba11cd 100644
--- a/scripts/install
+++ b/scripts/install
@@ -102,8 +102,8 @@ ynh_script_progression --message="Building Luckysheet... (this will take some ti
 pushd "$final_path" || ynh_die
 
 	ynh_use_nodejs
-	ynh_exec_warn_less ynh_npm install
-	ynh_exec_warn_less ynh_npm install gulp -g
+	ynh_exec_warn_less $ynh_npm install
+	ynh_exec_warn_less $ynh_npm install gulp -g
 
 popd || ynh_die
 
diff --git a/scripts/restore b/scripts/restore
index 6649250..e726e8d 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -35,10 +35,7 @@ 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 "
+test ! -d $final_path || ynh_die --message="There is already a directory: $final_path "
 
 #=================================================
 # STANDARD RESTORATION STEPS
diff --git a/scripts/upgrade b/scripts/upgrade
index 1c4996b..389ade8 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -111,12 +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
-
-	ynh_use_nodejs
-	ynh_npm install
-	ynh_npm install gulp -g
-	popd || ynh_die
+	pushd "$final_path"
+		ynh_use_nodejs
+		$ynh_npm install
+		$ynh_npm install gulp -g
+	popd
 fi
 
 #=================================================