Merge pull request #13 from RetroDECK/cooker

Merge cooker changes into main

Author: icenine451

pcsx2/component_functions.sh

@@ -5,6 +5,7 @@ pcsx2_config_PCSX2_vm="$XDG_CONFIG_HOME/PCSX2/inis/PCSX2_vm.ini"
 pcsx2_config_PCSX2_ui="$XDG_CONFIG_HOME/PCSX2/inis/PCSX2_ui.ini"
 pcsx2_config_GS="$XDG_CONFIG_HOME/PCSX2/inis/GS.ini"
 pcsx2_rd_config_dir="$rd_components/pcsx2/rd_config"
+pcsx2_rd_extras_dir="$rd_components/pcsx2/rd_extras"
 pcsx2_textures_path="$XDG_CONFIG_HOME/PCSX2/textures"
 pcsx2_vidoes_path="$XDG_CONFIG_HOME/PCSX2/videos"
 pcsx2_patches_path="$XDG_CONFIG_HOME/PCSX2/patches"

pcsx2/component_launcher.sh

@@ -4,13 +4,10 @@
 component_name="$(basename "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")")"
 component_path="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd)"
 
-source "$component_path/apprun-hooks/linuxdeploy-plugin-qt-hook.sh"
-
 log i "RetroDECK is now launching $component_name"
 log d "Library path is: $LD_LIBRARY_PATH"
 log d "QT plugin path is: $QT_PLUGIN_PATH"
 
 log i "RetroDECK is now launching $component_name"
-log d "Loaded app run hooks in apprun-hooks/linuxdeploy-plugin-qt-hook.sh"
 
 exec "$component_path/bin/pcsx2-qt" "$@"

pcsx2/component_update.sh

@@ -33,10 +33,11 @@ if [[ $(check_version_is_older_than "$version_being_updated" "0.10.0b") == "true
   create_dir -d "$logs_path/PCSX2"
   create_dir -d "$cheats_path/PCSX2/cheats_ws"
   create_dir -d "$cheats_path/PCSX2/cheats_ni"
-  tar -xzf "$component_extras/pcsx2-cheats.tar.gz" -C "$cheats_path/PCSX2" --overwrite
+  move "$cheats_path/pcsx2" "$cheats_path/PCSX2"
+  tar -xzf "$pcsx2_rd_extras_dir/pcsx2-cheats.tar.gz" -C "$cheats_path/PCSX2" --overwrite
   create_dir -d "$storage_path/PCSX2/covers"
   create_dir -d "$texture_packs_path/PCSX2/textures"
   create_dir -d "$videos_path/PCSX2"
-  prepare_component "postmove" "pcxs2"
-  tar -xzf "$component_extras/pcsx2-patches.tar.gz" -C "$mods_path/PCSX2/patches" --overwrite
+  prepare_component "postmove" "pcsx2"
+  tar -xzf "$pcsx2_rd_extras_dir/pcsx2-patches.tar.gz" -C "$mods_path/PCSX2/patches" --overwrite
 fi

ppsspp/component_functions.sh

@@ -5,8 +5,9 @@ ppsspp_config_controls="$XDG_CONFIG_HOME/ppsspp/PSP/SYSTEM/controls.ini"
 ppsspp_retroachievements_dat="$XDG_CONFIG_HOME/ppsspp/PSP/SYSTEM/ppsspp_retroachievements.dat"
 ppsspp_cheats_db="$rd_components/ppsspp/cheats/cheat.db"
 ppsspp_rd_config_dir="$rd_components/ppsspp/rd_config"
+ppsspp_rd_extras_dir="$rd_components/ppsspp/rd_extras"
 ppsspp_textures_path="$XDG_CONFIG_HOME/ppsspp/PSP/TEXTURES"
 ppsspp_shaders_path="$XDG_CONFIG_HOME/ppsspp/assets/shaders"
 ppsspp_cheats_path="$XDG_CONFIG_HOME/ppsspp/PSP/Cheats"
 ppsspp_mods_path="$XDG_CONFIG_HOME/ppsspp/PSP/PLUGINS"
-ppsspp_logs_path="$XDG_CONFIG_HOME/ppsspp/PSP/SYSTEM/DUMP"
+ppsspp_logs_path="$XDG_CONFIG_HOME/ppsspp/PSP/SYSTEM/DUMP"

ppsspp/component_update.sh

@@ -37,5 +37,5 @@ if [[ $(check_version_is_older_than "$version_being_updated" "0.10.0b") == "true
 
   prepare_component "postmove" "ppsspp"
 
-  unzip -q -o -j "$component_extras/CWCheat-Database-Plus--master.zip" "*/cheat.db" -d "$cheats_path/PPSSPP"
+  unzip -q -o -j "$ppsspp_rd_extras_dir/CWCheat-Database-Plus--master.zip" "*/cheat.db" -d "$cheats_path/PPSSPP"
 fi

retroarch/component_update.sh

@@ -81,7 +81,7 @@ if [[ $(check_version_is_older_than "$version_being_updated" "0.10.0b") == "true
   create_dir "$bios_path/mame2010/artwork"
   create_dir "$bios_path/mame2010/crosshairs"
   create_dir "$bios_path/mame2010/fonts"
-  tar -xzf "$component_extras/mame2003-plus" -C "$bios_path/mame2003-plus" --overwrite
+  tar -xzf "$retroarch_extras_path/mame2003-plus.tar.gz" -C "$bios_path/mame2003-plus" --overwrite
 
   prepare_component "postmove" "retroarch"
 fi

rpcs3/component_update.sh

@@ -58,12 +58,12 @@ if [[ $(check_version_is_older_than "$version_being_updated" "0.10.0b") == "true
 
   # Since in 0.10.0b we added the storage folder we need to migrate the folders
 
-  move "$bios_folder/rpcs3/dev_hdd0" "$storage_path/rpcs3/dev_hdd0"
-  move "$bios_folder/rpcs3/dev_hdd1" "$storage_path/rpcs3/dev_hdd1"
-  move "$bios_folder/rpcs3/dev_flash" "$storage_path/rpcs3/dev_flash"
-  move "$bios_folder/rpcs3/dev_flash2" "$storage_path/rpcs3/dev_flash2"
-  move "$bios_folder/rpcs3/dev_flash3" "$storage_path/rpcs3/dev_flash3"
-  move "$bios_folder/rpcs3/dev_bdvd" "$storage_path/rpcs3/dev_bdvd"
-  move "$bios_folder/rpcs3/dev_usb000" "$storage_path/rpcs3/dev_usb000"
-
+  unlink "$bios_path/rpcs3/dev_hdd0/home/00000001/savedata"
+  move "$bios_path/rpcs3/dev_hdd0" "$storage_path/rpcs3/dev_hdd0"
+  move "$bios_path/rpcs3/dev_hdd1" "$storage_path/rpcs3/dev_hdd1"
+  move "$bios_path/rpcs3/dev_flash" "$storage_path/rpcs3/dev_flash"
+  move "$bios_path/rpcs3/dev_flash2" "$storage_path/rpcs3/dev_flash2"
+  move "$bios_path/rpcs3/dev_flash3" "$storage_path/rpcs3/dev_flash3"
+  move "$bios_path/rpcs3/dev_bdvd" "$storage_path/rpcs3/dev_bdvd"
+  move "$bios_path/rpcs3/dev_usb000" "$storage_path/rpcs3/dev_usb000"
 fi

ruffle/component_recipe.json

@@ -17,6 +17,11 @@
           "dest": "component_version",
           "contents": "$SOURCE_VERSION"
         },
+        {
+          "type": "dir",
+          "source": "$REPO_ROOT/$COMPONENT_NAME/assets/rd_config",
+          "dest": "rd_config"
+        },
         {
           "type": "file",
           "source": "$REPO_ROOT/$COMPONENT_NAME/component_functions.sh",

vita3k/component_functions.sh

@@ -9,6 +9,7 @@ vita3k_textures_path="$storage_path/Vita3K/ux0/textures/import"
 vita3k_lang_path="$XDG_DATA_HOME/Vita3K/lang"
 vita3k_patch_path="$XDG_DATA_HOME/Vita3K/patch"
 vita3k_shaders_path="$XDG_CACHE_HOME/Vita3K/shaders"
+vita3k_rd_config_dir="$rd_components/vita3k/rd_config"
 
 update_vita3k_firmware() {
   if [[ $(check_network_connectivity) == "true" ]]; then

vita3k/component_update.sh

@@ -21,6 +21,6 @@ if [[ $(check_version_is_older_than "$version_being_updated" "0.10.0b") == "true
   log i "0.10.0b Upgrade - Postmove: Vita3K - Folder Creation"
 
   create_dir "$storage_path/Vita3K/"
-  cp -frv "$component_config/ux0" "$storage_path/Vita3K/" # User config
+  cp -frv "$vita3k_rd_config_dir/ux0" "$storage_path/Vita3K/" # User config
   prepare_component "postmove" "vita3k"
 fi