From 6692b15a46c2526b0cb882d2867b1184749e02e9 Mon Sep 17 00:00:00 2001
From: Krakinou <misterl56@hotmail.com>
Date: Sun, 6 Feb 2022 14:20:04 +0100
Subject: [PATCH] bugfixes

fix linter warning
fix root install in nginx conf
---
 scripts/change_url |  2 +-
 scripts/install    |  2 +-
 scripts/restore    | 12 ------------
 scripts/upgrade    | 31 +++++++++----------------------
 4 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/scripts/change_url b/scripts/change_url
index 082ff29..fc03a01 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -100,7 +100,7 @@ then
 	path_url="$new_path"
 	#Cannot use empty string for X-script-name, causes an issue in the python prg
 	if [ $path_url = "/" ] ; then
-		ynh_replace_string "        proxy_set_header		X-Script-Name" "#       proxy_set_header		X-Script-Name" ../conf/nginx.conf
+		ynh_replace_string "        proxy_set_header	X-Script-Name" "#       proxy_set_header	X-Script-Name" ../conf/nginx.conf
 	fi
 	# Create a dedicated nginx config
 	ynh_add_nginx_config
diff --git a/scripts/install b/scripts/install
index 1cafaca..604ebd2 100755
--- a/scripts/install
+++ b/scripts/install
@@ -120,7 +120,7 @@ ynh_script_progression --message="Setting up system configuration..." --weight=5
 
 
 if [ $path_url = "/" ] ; then
-	ynh_replace_string "        proxy_set_header		X-Script-Name" "#       proxy_set_header		X-Script-Name" ../conf/nginx.conf
+	ynh_replace_string "        proxy_set_header	X-Script-Name" "#        proxy_set_header	X-Script-Name" ../conf/nginx.conf
 fi
 
 # Create a dedicated nginx config
diff --git a/scripts/restore b/scripts/restore
index 0035190..e6dcfc5 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -26,7 +26,6 @@ domain=$(ynh_app_setting_get $app domain)
 path_url=$(ynh_app_setting_get $app path)
 final_path=$(ynh_app_setting_get $app final_path)
 calibre_dir=$(ynh_app_setting_get $app calibre_dir)
-is_public=$(ynh_app_setting_get $app is_public)
 port=$(ynh_app_setting_get $app port)
 
 #Source common.sh required to be after var initialization as some variables are updated in it that are then used in the script
@@ -164,17 +163,6 @@ ynh_replace_string --match_string="<policy domain="coder" rights="none" pattern=
 # Remove the option backup_core_only if it's in the settings.yml file
 ynh_app_setting_delete $app backup_core_only
 
-#=================================================
-# SETUP SSOWAT
-#=================================================
-
-# Make app public if necessary
-if [ $is_public -eq 1 ]
-then
-	# unprotected_uris allows SSO credentials to be passed anyway.
-	ynh_permission_update --permission "main" --add visitors
-fi
-
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index ebcfe6d..ef7aa85 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -22,7 +22,6 @@ domain=$(ynh_app_setting_get $app domain)
 port=$(ynh_app_setting_get $app port)
 path_url=$(ynh_app_setting_get $app path)
 admin=$(ynh_app_setting_get $app admin)
-is_public=$(ynh_app_setting_get $app is_public)
 final_path=$(ynh_app_setting_get $app final_path)
 language=$(ynh_app_setting_get $app language)
 
@@ -120,6 +119,14 @@ if sqlite3 $final_path/app.db "SELECT config_ldap_group_object_filter FROM setti
 	eval sqlite3 $final_path/app.db "\"UPDATE settings SET config_ldap_group_object_filter='(&(objectClass=posixGroup)(cn=%s.main))' WHERE ID=1\""
 fi
 
+# Cleaning legacy permissions
+if ynh_legacy_permissions_exists; then
+	ynh_legacy_permissions_delete_all
+
+	ynh_app_setting_delete --app=$app --key=is_public
+fi
+
+
 #=================================================
 # STANDARD UPGRADE STEPS
 #=================================================
@@ -147,7 +154,7 @@ fi
 
 ynh_script_progression --message="Upgrading nginx web server configuration..." --weight=5
 if [ $path_url = "/" ] ; then
-	ynh_replace_string "        proxy_set_header		X-Script-Name" "#       proxy_set_header		X-Script-Name" ../conf/nginx.conf
+	ynh_replace_string "        proxy_set_header	X-Script-Name" "#       proxy_set_header	X-Script-Name" ../conf/nginx.conf
 fi
 # Create a dedicated nginx config
 ynh_add_nginx_config
@@ -232,26 +239,6 @@ chown -R $app: $final_path
 
 yunohost service add $app --description="Browse eBook in the web" --log="/var/log/$app/$app.log"
 
-#=================================================
-# SETUP SSOWAT
-#=================================================
-
-# Make app public if necessary
-if [ $is_public -eq 1 ]
-then
-	# unprotected_uris allows SSO credentials to be passed anyway
-	#ynh_app_setting_set $app unprotected_uris "/"
-	ynh_permission_update --permission "main" --add visitors
-fi
-
-#=================================================
-# PACKAGE_CHECK
-#=================================================
-#This line of code is just used to caused an error in upgrade to be tested by package_check 
-if [ -e /tmp/upgrade_error ]; then
-	ynh_die
-fi
-
 #=================================================
 # RELOAD NGINX
 #=================================================