From b5369d1aa72c0c18390749296fa1dd18e042d73e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Sat, 31 Aug 2024 11:39:28 +0200
Subject: [PATCH] Cleanup after auto patch

---
 conf/hibernate.cfg.xml |  1 +
 conf/xwiki.cfg         |  2 ++
 conf/xwiki.properties  |  2 ++
 manifest.toml          |  1 -
 scripts/_common.sh     | 16 ++++++++--------
 scripts/install        |  2 +-
 scripts/upgrade        |  2 +-
 tests.toml             |  1 +
 8 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/conf/hibernate.cfg.xml b/conf/hibernate.cfg.xml
index 7913339..d04fa8b 100644
--- a/conf/hibernate.cfg.xml
+++ b/conf/hibernate.cfg.xml
@@ -17,6 +17,7 @@
 * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 -->
+<!-- WARNING: Don't edit this file. All change will be removed after each app upgrade -->
 <hibernate-configuration>
     <session-factory>
         <!--  Please refer to the installation guide on
diff --git a/conf/xwiki.cfg b/conf/xwiki.cfg
index 0113768..53bc1d0 100644
--- a/conf/xwiki.cfg
+++ b/conf/xwiki.cfg
@@ -18,6 +18,8 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
 
+# WARNING: Don't edit this file. All change will be removed after each app upgrade
+
 #---------------------------------------
 # Preamble
 #
diff --git a/conf/xwiki.properties b/conf/xwiki.properties
index cabd93d..fb0071d 100644
--- a/conf/xwiki.properties
+++ b/conf/xwiki.properties
@@ -18,6 +18,8 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
 
+# WARNING: Don't edit this file. All change will be removed after each app upgrade
+
 # This is the new XWiki configuration file. In the future it'll replace the old
 # xwiki.cfg file. However right now it's only used by some XWiki components.
 # As time progresses more and more component will get their configurations from
diff --git a/manifest.toml b/manifest.toml
index 32e2d47..916f4bf 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -99,7 +99,6 @@ ram.runtime = "1G"
     allow_email = true
 
     [resources.install_dir]
-    dir = "/opt/yunohost/__APP__"
 
     [resources.data_dir]
     dir = "/home/yunohost.app/__APP__"
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 8829399..6ef1506 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -9,13 +9,13 @@ systemd_match_start_line='oxtjl.NotifyListener:main: ---------------------------
 flavor_version='16.3.1'
 ldap_version='9.15.2'
 
-if [ $install_standard_flavor -eq 1 ]; then
+if [ "$install_standard_flavor" -eq 1 ]; then
     distribution_default_ui="distribution.defaultUI=org.xwiki.platform:xwiki-platform-distribution-flavor-mainwiki/$flavor_version"
 else
     distribution_default_ui='#'
 fi
 
-if [ $path == '/' ]; then
+if [ "$path" == '/' ]; then
     install_on_root=true
     path2=''
     path3=''
@@ -144,18 +144,18 @@ add_config() {
     # Note that using /etc/xwiki/xwiki.cfg or /etc/xwiki/xwiki.properties is hard coded on the application
     # And using this break multi instance feature so we must use an other path
     # Note that symlink don't work. So use hard link instead.
-    ln -f /etc/$app/xwiki_conf.cfg "$web_inf_path"/xwiki.cfg
-    ln -f /etc/$app/xwiki_conf.properties "$web_inf_path"/xwiki.properties
+    ln -f /etc/"$app"/xwiki_conf.cfg "$web_inf_path"/xwiki.cfg
+    ln -f /etc/"$app"/xwiki_conf.properties "$web_inf_path"/xwiki.properties
 }
 
 set_permissions() {
-    #REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R u+rwX,o-rwx "$install_dir"
-    #REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R "$app:$app" "$install_dir"
+    chmod -R u+rwX,o-rwx "$install_dir"
+    chown -R "$app:$app" "$install_dir"
     chmod -R u=rwX,g=rX,o= /etc/"$app"
     chown -R "$app:$app" /etc/"$app"
 
-    #REMOVEME? Assuming ynh_config_add_logrotate is called, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown "$app:$app" -R /var/log/"$app"
-    #REMOVEME? Assuming ynh_config_add_logrotate is called, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod u=rwX,g=rX,o= -R /var/log/"$app"
+    chown "$app:$app" -R /var/log/"$app"
+    chmod u=rwX,g=rX,o= -R /var/log/"$app"
 
     find "$data_dir" \(   \! -perm -o= \
                     -o \! -user "$app" \
diff --git a/scripts/install b/scripts/install
index c01b14d..c3b5748 100755
--- a/scripts/install
+++ b/scripts/install
@@ -73,7 +73,7 @@ disable_super_admin
 # START SYSTEMD SERVICE
 #=================================================
 
-ynh_script_progression 'Starting $app's systemd service...'
+ynh_script_progression "Starting $app's systemd service..."
 ynh_systemctl --service="$app" --action=start --log_path=systemd --wait_until="$systemd_match_start_line"
 wait_xwiki_started
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 30f203e..10660a9 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -74,7 +74,7 @@ disable_super_admin
 # START SYSTEMD SERVICE
 #=================================================
 
-ynh_script_progression 'Starting $app's systemd service...'
+ynh_script_progression "Starting $app's systemd service..."
 ynh_systemctl --service="$app" --action=start --log_path=systemd --wait_until="$systemd_match_start_line"
 wait_xwiki_started
 
diff --git a/tests.toml b/tests.toml
index d64ef3c..71f6bd6 100644
--- a/tests.toml
+++ b/tests.toml
@@ -5,3 +5,4 @@ test_format = 1.0
     # ------------
     # Tests to run
     # ------------
+    test_upgrade_from.0bfd0bdfeed0696c71fd79727a28fccc8822e123.name = "Before helper 2.1"