From af2889bba11f8ff368e9e060bc29eff3d30a57f7 Mon Sep 17 00:00:00 2001
From: XargonWan <xargonwan@gmail.com>
Date: Wed, 6 Dec 2023 11:48:22 +0100
Subject: [PATCH] VITA3K: moved it in the RO FS

---
 functions/prepare_emulator.sh |  8 --------
 net.retrodeck.retrodeck.yml   | 13 +++++--------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/functions/prepare_emulator.sh b/functions/prepare_emulator.sh
index 1a0c44ee..5d0bc692 100644
--- a/functions/prepare_emulator.sh
+++ b/functions/prepare_emulator.sh
@@ -674,14 +674,6 @@ prepare_emulator() {
     echo "Initializing Vita3K"
     echo "----------------------"
 
-    # extracting the emulator
-    # NOTE: the emulator 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"
-    mkdir -p "/var/data/Vita3K"
-    unzip "/app/retrodeck/vita3k.zip" -d "/var/data/Vita3K"
-    chmod +x "/var/data/Vita3K/Vita3K"
-    rm -f "/var/data/Vita3K/update-vita3k.sh"
-
     # copying config file
     cp -fvr "$emuconfigs/vita3k/config.yml" "/var/config/Vita3K"
     # TODO: this step is to be done properly: Replacing RETRODECKHOMEDIR placeholder
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index eac05b53..10d070e5 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -1228,20 +1228,17 @@ modules:
   # Cemu - END
 
   # Vita3K - START
-  # Vita3K is writing some files in its own directory
-  # So that is placed in /var/data/Vita3K and not in the readonly filesystem
-  # This module is just fetching the file so it will be unique for this build
 
   - name: vita3k
     buildsystem: simple
-    build-commands:
-      # Creating an empty symlink that will point to Vita3K binary
-      - ln -s /var/data/Vita3K/Vita3K ${FLATPAK_DEST}/bin/Vita3K
+    build-commands:    
       # Copying the user icon
       - mkdir -p ${FLATPAK_DEST}/retrodeck
       - cp retrodeck.png ${FLATPAK_DEST}/retrodeck
-      # preparing the vita3k zip for later
-      - mv ubuntu-latest.zip ${FLATPAK_DEST}/retrodeck/vita3k.zip
+      - unzip "ubuntu-latest.zip" -d "${FLATPAK_DEST}/bin/Vita3K"
+      - chmod +x ""${FLATPAK_DEST}/bin/Vita3K/Vita3K"
+      - rm -f "${FLATPAK_DEST}/bin/Vita3K/update-vita3k.sh"
+      - ln -s ${FLATPAK_DEST}/bin/Vita3K/Vita3K ${FLATPAK_DEST}/bin/Vita3K
     sources:
       - type: file
         url: https://github.com/Vita3K/Vita3K/releases/download/continuous/ubuntu-latest.zip