From fbf6ad2c26795ce7614a088c53c651a0dad8c748 Mon Sep 17 00:00:00 2001
From: ljf <ljf+git@grimaud.me>
Date: Mon, 17 Jan 2022 02:48:39 +0100
Subject: [PATCH] [fix] Restore

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

diff --git a/scripts/install b/scripts/install
index 76c526c..bd05f3e 100755
--- a/scripts/install
+++ b/scripts/install
@@ -120,7 +120,7 @@ datadir=/home/yunohost.app/limesurvey/upload
 ynh_app_setting_set --app=$app --key=datadir --value=$datadir
 mkdir -p $datadir
 # Remove upload if empty
-rmdir $datadir && mv "$final_path/upload" $datadir || true
+rmdir $datadir 2> /dev/null && mv "$final_path/upload" $datadir || true
 chown -R $app:www-data "$datadir"
 chmod -R o-rwx "$datadir"
 ln -s $datadir $final_path/upload 2> /dev/null || true
diff --git a/scripts/restore b/scripts/restore
index 290cc64..947ba9a 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -27,6 +27,7 @@ app=$YNH_APP_INSTANCE_NAME
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+datadir=$(ynh_app_setting_get --app=$app --key=datadir)
 admin=$(ynh_app_setting_get --app=$app --key=admin)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 db_user=$db_name
diff --git a/scripts/upgrade b/scripts/upgrade
index 7d69764..47cadc7 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -70,7 +70,7 @@ if [ -z "$datadir" ]; then
    ynh_app_setting_set --app=$app --key=datadir --value=$datadir
    mkdir -p $datadir
     # Remove upload if empty
-    rmdir $datadir && mv "$final_path/upload" $datadir || true
+    rmdir $datadir 2> /dev/null && mv "$final_path/upload" $datadir || true
    chown -R $app:www-data "$datadir"
    chmod -R o-rwx "$datadir"
     ln -s $datadir $final_path/upload