From 65de51efd55daccb83cbf49dbf22356ab44d27f9 Mon Sep 17 00:00:00 2001
From: ljf <ljf+yunohost@grimaud.me>
Date: Tue, 7 Feb 2017 03:09:09 +0100
Subject: [PATCH] [fix] Linter, multi-instance on remove, restore check

---
 scripts/remove  | 3 ++-
 scripts/restore | 2 +-
 scripts/upgrade | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/remove b/scripts/remove
index c6c0d86..3b89d91 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -20,7 +20,8 @@ ynh_rm_php_fpm_conf
 # We can't delete it before because php5-fpm use it
 ynh_system_user_delete "$user"
 
-ynh_package_remove $app-ynh-deps
+dep_app=${app/__/-}
+ynh_package_remove $dep_app-ynh-deps
 
 sudo yunohost app ssowatconf
 echo -e "\e[0m" # Restore norml color
diff --git a/scripts/restore b/scripts/restore
index bfbe180..9b46dfb 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -147,7 +147,7 @@ dbuser=$user
 # CHECK IF THE APP CAN BE RESTORED
 #=================================================
 
-ynh_path_validity "$domain$path"
+#ynh_path_validity "$domain$path"
 ynh_check_restore
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 8b79e65..0b0f948 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -38,7 +38,7 @@ if [ "${version}" = "2.0.5" ]; then
         sudo mv $upload_path $local_path/
     fi
     
-    sudo yunohost app setting $app skipped_uris -d
+    ynh_app_setting_delete $app skipped_uris
     ynh_sso_access "/index.php?r=admin,/index.php?r=plugins,/scripts"
 
     ynh_configure_php_fpm