From 6fd3ff61fb37023369b473abb55023a985b50f61 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Sat, 22 Jun 2024 21:40:22 +0900
Subject: [PATCH] VITA3K: some configurationschanged upstream, reflecting them

---
 functions/global.sh            |  3 +--
 functions/post_update.sh       |  7 +++++++
 functions/prepare_component.sh | 20 ++++++++++----------
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/functions/global.sh b/functions/global.sh
index 800515a6..52db4426 100644
--- a/functions/global.sh
+++ b/functions/global.sh
@@ -118,8 +118,7 @@ rpcs3vfsconf="/var/config/rpcs3/vfs.yml"
 
 # Vita3k config files
 
-vita3kconf="/var/data/Vita3K/config.yml"
-vita3kusrconfdir="$bios_folder/Vita3K/Vita3K"
+vita3kconf="/var/config/Vita3K/config.yml"
 
 # MAME-SA config files
 
diff --git a/functions/post_update.sh b/functions/post_update.sh
index 3dcc012b..4c82306e 100644
--- a/functions/post_update.sh
+++ b/functions/post_update.sh
@@ -339,6 +339,13 @@ post_update() {
     fi
   fi
 
+  if [[ $(check_version_is_older_than "0.8.2b") == "true" ]]; then
+    if [ -d ] then;
+      log i "Vita3K changed some paths, reflecting them: moving \"/var/data/Vita3K\" in \"/var/config/Vita3K\""
+      mv -f "/var/data/Vita3K" "/var/config/Vita3K"
+    fi
+  fi
+
   # if [[ $(check_version_is_older_than "0.9.0b") == "true" ]]; then
   #   # Placeholder for version 0.9.0b
   #   rm /var/config/emulationstation/.emulationstation # remving the old symlink to .emulationstation as it might be not needed anymore
diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh
index 01258bbf..13922609 100644
--- a/functions/prepare_component.sh
+++ b/functions/prepare_component.sh
@@ -250,7 +250,7 @@ prepare_component() {
       set_setting_value "$rd_conf" "citra" "$(get_setting_value "$rd_defaults" "citra" "retrodeck" "ask_to_exit")" "retrodeck" "ask_to_exit"
     fi
     if [[ "$action" == "postmove" ]]; then # Run only post-move commands
-      dir_prep "$rdhome/bios/citra/sysdata" "/var/data/citra-emu/sysdata"
+      dir_prep "$bios_folder/citra/sysdata" "/var/data/citra-emu/sysdata"
       dir_prep "$rdhome/logs/citra" "/var/data/citra-emu/log"
       dir_prep "$mods_folder/Citra" "/var/data/citra-emu/load/mods"
       dir_prep "$texture_packs_folder/Citra" "/var/data/citra-emu/load/textures"
@@ -748,18 +748,18 @@ prepare_component() {
         log d "Figure out what Vita3k needs for multi-user"
       else # Single-user actions
         # NOTE: the component is writing in "." so it must be placed in the rw filesystem. A symlink of the binary is already placed in /app/bin/Vita3K
-        rm -rf "/var/data/Vita3K"
-        create_dir "/var/data/Vita3K/Vita3K"
-        cp -fvr "$emuconfigs/vita3k/config.yml" "/var/data/Vita3K" # component config
-        cp -fvr "$emuconfigs/vita3k/ux0" "$bios_folder/Vita3K/Vita3K" # User config
-        set_setting_value "$vita3kconf" "pref-path" "$rdhome/bios/Vita3K/Vita3K/" "vita3k"
+        rm -rf "/var/config/Vita3K"
+        create_dir "/var/config/Vita3K"
+        cp -fvr "$emuconfigs/vita3k/config.yml" "$vita3kconf" # component config
+        cp -fvr "$emuconfigs/vita3k/ux0" "$bios_folder/Vita3K/" # User config
+        set_setting_value "$vita3kconf" "pref-path" "$bios_folder/Vita3K/" "vita3k"
       fi
       # Shared actions
-      dir_prep "$saves_folder/psvita/vita3k" "$bios_folder/Vita3K/Vita3K/ux0/user/00/savedata" # Multi-user safe?
+      dir_prep "$saves_folder/psvita/vita3k" "$bios_folder/Vita3K/ux0/user/00/savedata" # Multi-user safe?
     fi
     if [[ "$action" == "postmove" ]]; then # Run only post-move commands
-      dir_prep "$saves_folder/psvita/vita3k" "$bios_folder/Vita3K/Vita3K/ux0/user/00/savedata" # Multi-user safe?
-      set_setting_value "$vita3kconf" "pref-path" "$rdhome/bios/Vita3K/Vita3K/" "vita3k"
+      dir_prep "$saves_folder/psvita/vita3k" "$bios_folder/Vita3K/ux0/user/00/savedata" # Multi-user safe?
+      set_setting_value "$vita3kconf" "pref-path" "$bios_folder/Vita3K/" "vita3k"
     fi
   fi
 
@@ -845,7 +845,7 @@ prepare_component() {
     create_dir "/var/data/gzdoom/audio/midi"
     create_dir "/var/data/gzdoom/audio/fm_banks"
     create_dir "/var/data/gzdoom/audio/soundfonts"
-    create_dir "$rdhome/bios/gzdoom"
+    create_dir "$bios_folder/gzdoom"
 
     cp -fvr "$emuconfigs/gzdoom/gzdoom.ini" "/var/config/gzdoom"