mirror of
				https://github.com/RetroDECK/RetroDECK.git
				synced 2025-04-10 19:15:12 +00:00 
			
		
		
		
	Merge branch 'cooker-0.4.2b' of https://github.com/XargonWan/RetroDECK into cooker-0.4.2b
This commit is contained in:
		
						commit
						3f40a55e0b
					
				
							
								
								
									
										2
									
								
								.github/workflows/main-selfhosted.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/main-selfhosted.yml
									
									
									
									
										vendored
									
									
								
							|  | @ -39,7 +39,7 @@ jobs: | ||||||
|           git submodule update |           git submodule update | ||||||
|           sudo apt install -y flatpak flatpak-builder p7zip-full |           sudo apt install -y flatpak flatpak-builder p7zip-full | ||||||
|           flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo |           flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo | ||||||
|           flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13 |           flatpak install --user -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13 | ||||||
| 
 | 
 | ||||||
|       # for main remember to change ${HOME} into ${GITHUB_WORKSPACE} |       # for main remember to change ${HOME} into ${GITHUB_WORKSPACE} | ||||||
|       - name: Build flatpak |       - name: Build flatpak | ||||||
|  |  | ||||||
|  | @ -1048,7 +1048,7 @@ modules: | ||||||
|         # TODO: group the configs per-emu and optimize the following cps, like already done with Dolphin. Please not that some files may be renamed, check retrodeck.sh to know how (and fix it after the edit) |         # TODO: group the configs per-emu and optimize the following cps, like already done with Dolphin. Please not that some files may be renamed, check retrodeck.sh to know how (and fix it after the edit) | ||||||
| 
 | 
 | ||||||
|         # Configuring emulators: |         # Configuring emulators: | ||||||
|         - mkdir -p ${FLATPAK_DEST}/retrodeck/emu-configs/ |         - mkdir -p ${FLATPAK_DEST}/retrodeck/emu-configs/Dolphin | ||||||
|         # RetroArch |         # RetroArch | ||||||
|         - cp emu-configs/retroarch* ${FLATPAK_DEST}/retrodeck/emu-configs/ |         - cp emu-configs/retroarch* ${FLATPAK_DEST}/retrodeck/emu-configs/ | ||||||
|         # Dolphin  |         # Dolphin  | ||||||
|  |  | ||||||
							
								
								
									
										47
									
								
								retrodeck.sh
									
									
									
									
									
								
							
							
						
						
									
										47
									
								
								retrodeck.sh
									
									
									
									
									
								
							|  | @ -16,7 +16,7 @@ dir_prep() { | ||||||
|     real="$1" |     real="$1" | ||||||
|     symlink="$2" |     symlink="$2" | ||||||
| 
 | 
 | ||||||
|     echo -e "\nDIR PREP: Moving $symlink in $real" #DEBUG |     echo -e "\n[DIR PREP]\nMoving $symlink in $real" #DEBUG | ||||||
| 
 | 
 | ||||||
|     # if the dest dir exists we want to backup it |     # if the dest dir exists we want to backup it | ||||||
|     if [ -d "$symlink" ]; |     if [ -d "$symlink" ]; | ||||||
|  | @ -46,16 +46,7 @@ dir_prep() { | ||||||
|       rm -rf "$symlink.old" |       rm -rf "$symlink.old" | ||||||
|     fi |     fi | ||||||
| 
 | 
 | ||||||
|     #DEBUG |     echo -e "$symlink is now $real\n" | ||||||
|     previous_dir=$PWD |  | ||||||
|     cd $real |  | ||||||
|     cd .. |  | ||||||
|     echo "We are in $PWD" #DEBUG |  | ||||||
|     ls -ln |  | ||||||
|     cd $previous_dir |  | ||||||
|     #DEBUG |  | ||||||
| 
 |  | ||||||
|     echo $symlink is now $real |  | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| cfg_init() { | cfg_init() { | ||||||
|  | @ -89,9 +80,14 @@ tools_init() { | ||||||
| standalones_init() { | standalones_init() { | ||||||
|     # This script is configuring the standalone emulators with the default files present in emuconfigs folder |     # This script is configuring the standalone emulators with the default files present in emuconfigs folder | ||||||
|      |      | ||||||
|  |     echo "----------------------" | ||||||
|     echo "Initializing standalone emulators" |     echo "Initializing standalone emulators" | ||||||
|  |     echo "----------------------" | ||||||
| 
 | 
 | ||||||
|     # Yuzu |     # Yuzu | ||||||
|  |     echo "----------------------" | ||||||
|  |     echo "Initializing YUZU" | ||||||
|  |     echo "----------------------" | ||||||
|     # removing dead symlinks as they were present in a past version |     # removing dead symlinks as they were present in a past version | ||||||
|     if [ -d $rdhome/bios/switch ]; then |     if [ -d $rdhome/bios/switch ]; then | ||||||
|       find $rdhome/bios/switch -xtype l -exec rm {} \; |       find $rdhome/bios/switch -xtype l -exec rm {} \; | ||||||
|  | @ -102,34 +98,46 @@ standalones_init() { | ||||||
|     dir_prep "$rdhome/bios/switch/registered" "/var/data/yuzu/nand/system/Contents/registered" |     dir_prep "$rdhome/bios/switch/registered" "/var/data/yuzu/nand/system/Contents/registered" | ||||||
|     # configuring Yuzu |     # configuring Yuzu | ||||||
|     mkdir -pv /var/config/yuzu/ |     mkdir -pv /var/config/yuzu/ | ||||||
|     cp -fv $emuconfigs/yuzu-qt-config.ini /var/config/yuzu/qt-config.ini |     cp -fvr $emuconfigs/yuzu-qt-config.ini /var/config/yuzu/qt-config.ini | ||||||
|     sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/yuzu/qt-config.ini |     sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/yuzu/qt-config.ini | ||||||
|     dir_prep "$rdhome/screenshots" "/var/data/yuzu/screenshots" |     dir_prep "$rdhome/screenshots" "/var/data/yuzu/screenshots" | ||||||
| 
 | 
 | ||||||
|     # Dolphin |     # Dolphin | ||||||
|  |     echo "----------------------" | ||||||
|  |     echo "Initializing DOLPHIN" | ||||||
|  |     echo "----------------------" | ||||||
|     mkdir -pv /var/config/dolphin-emu/ |     mkdir -pv /var/config/dolphin-emu/ | ||||||
|     cp -fv $emuconfigs/Dolphin/* /var/config/dolphin-emu/ |     cp -fvr "$emuconfigs/Dolphin/"* /var/config/dolphin-emu/ | ||||||
|     dir_prep "$rdhome/saves" "/var/data/dolphin-emu/GBA/Saves" |     dir_prep "$rdhome/saves" "/var/data/dolphin-emu/GBA/Saves" | ||||||
|     dir_prep "$rdhome/saves" "/var/data/dolphin-emu/Wii" |     dir_prep "$rdhome/saves" "/var/data/dolphin-emu/Wii" | ||||||
| 
 | 
 | ||||||
|     # pcsx2 |     # pcsx2 | ||||||
|  |     echo "----------------------" | ||||||
|  |     echo "Initializing PCSX2" | ||||||
|  |     echo "----------------------" | ||||||
|     mkdir -pv /var/config/PCSX2/inis/ |     mkdir -pv /var/config/PCSX2/inis/ | ||||||
|     cp -fv $emuconfigs/PCSX2_ui.ini /var/config/PCSX2/inis/ |     cp -fvr $emuconfigs/PCSX2_ui.ini /var/config/PCSX2/inis/ | ||||||
|     sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/PCSX2/inis/PCSX2_ui.ini |     sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/PCSX2/inis/PCSX2_ui.ini | ||||||
|     cp -fv $emuconfigs/GS.ini /var/config/PCSX2/inis/ |     cp -fvr $emuconfigs/GS.ini /var/config/PCSX2/inis/ | ||||||
|     cp -fv $emuconfigs/PCSX2_vm.ini /var/config/PCSX2/inis/ |     cp -fvr $emuconfigs/PCSX2_vm.ini /var/config/PCSX2/inis/ | ||||||
|     dir_prep "$rdhome/states" "/var/config/PCSX2/sstates" |     dir_prep "$rdhome/states" "/var/config/PCSX2/sstates" | ||||||
|     dir_prep "$rdhome/screenshots" "/var/config/PCSX2/snaps" |     dir_prep "$rdhome/screenshots" "/var/config/PCSX2/snaps" | ||||||
|     dir_prep "$rdhome/.logs" "/var/config/PCSX2/logs" |     dir_prep "$rdhome/.logs" "/var/config/PCSX2/logs" | ||||||
| 
 | 
 | ||||||
|     # MelonDS |     # MelonDS | ||||||
|  |     echo "----------------------" | ||||||
|  |     echo "Initializing MELONDS" | ||||||
|  |     echo "----------------------" | ||||||
|     mkdir -pv /var/config/melonDS/ |     mkdir -pv /var/config/melonDS/ | ||||||
|     dir_prep "$rdhome/bios" "/var/config/melonDS/bios" |     dir_prep "$rdhome/bios" "/var/config/melonDS/bios" | ||||||
|     cp -fv $emuconfigs/melonDS.ini /var/config/melonDS/ |     cp -fvr $emuconfigs/melonDS.ini /var/config/melonDS/ | ||||||
|     # Replace ~/retrodeck with $rdhome as ~ cannot be understood by MelonDS |     # Replace ~/retrodeck with $rdhome as ~ cannot be understood by MelonDS | ||||||
|     sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/melonDS/melonDS.ini |     sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/melonDS/melonDS.ini | ||||||
| 
 | 
 | ||||||
|     # CITRA |     # CITRA | ||||||
|  |     echo "----------------------" | ||||||
|  |     echo "Initializing CITRA" | ||||||
|  |     echo "----------------------" | ||||||
|     mkdir -pv /var/config/citra-emu/ |     mkdir -pv /var/config/citra-emu/ | ||||||
|     cp -fv $emuconfigs/citra-qt-config.ini /var/config/citra-emu/qt-config.ini |     cp -fv $emuconfigs/citra-qt-config.ini /var/config/citra-emu/qt-config.ini | ||||||
|     sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/citra-emu/qt-config.ini |     sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/citra-emu/qt-config.ini | ||||||
|  | @ -138,8 +146,11 @@ standalones_init() { | ||||||
|     #sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/citra-emu/qt-config.ini |     #sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/citra-emu/qt-config.ini | ||||||
| 
 | 
 | ||||||
|     # RPCS3 |     # RPCS3 | ||||||
|  |     echo "----------------------" | ||||||
|  |     echo "Initializing RPCS3" | ||||||
|  |     echo "----------------------" | ||||||
|     mkdir -pv /var/config/rpcs3/ |     mkdir -pv /var/config/rpcs3/ | ||||||
|     cp -fv $emuconfigs/config.yml /var/config/rpcs3/ |     cp -fvr $emuconfigs/config.yml /var/config/rpcs3/ | ||||||
| 
 | 
 | ||||||
|     # PICO-8 |     # PICO-8 | ||||||
|     # Moved PICO-8 stuff in the finit as only it knows here roms folders is |     # Moved PICO-8 stuff in the finit as only it knows here roms folders is | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue