mirror of
https://github.com/RetroDECK/RetroDECK.git
synced 2024-11-25 15:35:38 +00:00
Merge pull request #372 from icenine451/cooker-0.7.0b-icenine451
Cooker 0.7.0b icenine451
This commit is contained in:
icenine451
GitHub
commit
d85a557354
|
|
@ -63,7 +63,7 @@
|
|||
<bool name="ScraperExcludeRecursively" value="true" />
|
||||
<bool name="ScraperHaltOnInvalidMedia" value="false" />
|
||||
<bool name="ScraperIncludeFolders" value="true" />
|
||||
<bool name="ScraperInteractive" value="true" />
|
||||
<bool name="ScraperInteractive" value="false" />
|
||||
<bool name="ScraperOverwriteData" value="false" />
|
||||
<bool name="ScraperRegionFallback" value="true" />
|
||||
<bool name="ScraperRespectExclusions" value="true" />
|
||||
|
|
|
|||
|
|
@ -1863,7 +1863,7 @@
|
|||
<platform>zxspectrum</platform>
|
||||
<theme>zxspectrum</theme>
|
||||
</system>
|
||||
<system>
|
||||
<!-- <system>
|
||||
<name>tools</name>
|
||||
<fullname>RetroDECK Tools</fullname>
|
||||
<path>/app/tools</path>
|
||||
|
|
@ -1871,5 +1871,5 @@
|
|||
<command>bash %ROM%</command>
|
||||
<platform>tools</platform>
|
||||
<theme>tools</theme>
|
||||
</system>
|
||||
</systemList>
|
||||
</system> -->
|
||||
</systemList>
|
||||
|
|
|
|||
36
functions.sh
36
functions.sh
|
|
@ -325,6 +325,9 @@ set_setting_value() {
|
|||
else
|
||||
sed -i '\^\['"$current_section_name"'\]^,\^\^'"$setting_name_to_change"'.*^s^\^'"$setting_name_to_change"'=.*^'"$setting_name_to_change"'='"$setting_value_to_change"'^' $1
|
||||
fi
|
||||
if [[ "$4" == "retrodeck" ]]; then # If a RetroDECK setting is being changed, also write it to memory for immediate use
|
||||
eval "$setting_name_to_change=$setting_value_to_change"
|
||||
fi
|
||||
;;
|
||||
|
||||
"retroarch" )
|
||||
|
|
@ -758,7 +761,7 @@ check_for_version_update() {
|
|||
mkdir -p "$rdhome/RetroDECK_Updates"
|
||||
wget -P "$rdhome/RetroDECK_Updates" $latest_cooker_download
|
||||
flatpak-spawn --host flatpak install --user --bundle --noninteractive -y "$rdhome/RetroDECK_Updates/RetroDECK.flatpak"
|
||||
rm -f "$rdhome/RetroDECK_Updates" # Cleanup old bundles to save space
|
||||
rm -rf "$rdhome/RetroDECK_Updates" # Cleanup old bundles to save space
|
||||
) |
|
||||
zenity --icon-name=net.retrodeck.retrodeck --progress --no-cancel --pulsate --auto-close \
|
||||
--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
|
||||
|
|
@ -1780,6 +1783,28 @@ backup_retrodeck_userdata() {
|
|||
zip -rq9 "$backups_folder/$(date +"%0m%0d")_retrodeck_userdata.zip" "$saves_folder" "$states_folder" "$bios_folder" "$media_folder" "$themes_folder" "$logs_folder" "$screenshots_folder" "$mods_folder" "$texture_packs_folder" "$borders_folder" > $logs_folder/$(date +"%0m%0d")_backup_log.log
|
||||
}
|
||||
|
||||
install_retrodeck_starterpack() {
|
||||
# This function will install the roms, gamelists and metadata for the RetroDECK Starter Pack, a curated selection of games the creators of RetroDECK enjoy.
|
||||
# USAGE: install_retrodeck_starterpack
|
||||
|
||||
## DOOM section ##
|
||||
cp /app/retrodeck/extras/doom1.wad "$roms_folder/doom/doom1.wad" # No -f in case the user already has it
|
||||
mkdir -p "/var/config/emulationstation/.emulationstation/gamelists/doom"
|
||||
if [[ ! -f "/var/config/emulationstation/.emulationstation/gamelists/doom/gamelist.xml" ]]; then # Don't overwrite an existing gamelist
|
||||
cp "/app/retrodeck/rd_prepacks/doom/gamelist.xml" "/var/config/emulationstation/.emulationstation/gamelists/doom/gamelist.xml"
|
||||
fi
|
||||
mkdir -p "$media_folder/doom"
|
||||
unzip -oq "/app/retrodeck/rd_prepacks/doom/doom.zip" -d "$media_folder/doom/"
|
||||
}
|
||||
|
||||
install_retrodeck_controller_profile() {
|
||||
# This function will install the needed files for the custom RetroDECK controller profile
|
||||
# NOTE: These files need to be stored in shared locations for Steam, outside of the normal RetroDECK folders and should always be an optional user choice
|
||||
# USAGE: install_retrodeck_controller_profile
|
||||
rsync -a "/app/retrodeck/binding-icons/" "$HOME/.steam/steam/tenfoot/resource/images/library/controller/binding_icons/"
|
||||
cp -f "$emuconfigs/defaults/retrodeck/RetroDECK_controller_config.vdf" "$HOME/.steam/steam/controller_base/templates/RetroDECK_controller_config.vdf"
|
||||
}
|
||||
|
||||
create_lock() {
|
||||
# creating RetroDECK's lock file and writing the version in the config file
|
||||
version=$hard_version
|
||||
|
|
@ -1975,15 +2000,10 @@ finit() {
|
|||
fi
|
||||
fi
|
||||
if [[ "$finit_options_choices" =~ (rd_controller_profile|Enable All) ]]; then
|
||||
rsync -a "/app/retrodeck/binding-icons/" "$HOME/.steam/steam/tenfoot/resource/images/library/controller/binding_icons/"
|
||||
cp -f "$emuconfigs/defaults/retrodeck/RetroDECK_controller_config.vdf" "$HOME/.steam/steam/controller_base/templates/RetroDECK_controller_config.vdf"
|
||||
install_retrodeck_controller_profile
|
||||
fi
|
||||
if [[ "$finit_options_choices" =~ (rd_prepacks|Enable All) ]]; then
|
||||
cp /app/retrodeck/extras/doom1.wad "$roms_folder/doom/doom1.wad" # No -f in case the user already has it
|
||||
mkdir -p "/var/config/emulationstation/.emulationstation/gamelists/doom"
|
||||
cp "/app/retrodeck/rd_prepacks/doom/gamelist.xml" "/var/config/emulationstation/.emulationstation/gamelists/doom/gamelist.xml"
|
||||
mkdir -p "$media_folder/doom"
|
||||
unzip -oq "/app/retrodeck/rd_prepacks/doom/doom.zip" -d "$media_folder/doom/"
|
||||
install_retrodeck_starterpack
|
||||
fi
|
||||
|
||||
) |
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ if [[ ! -f "$rd_conf" ]]; then
|
|||
if grep -qF "cooker" <<< $hard_version; then # If newly-installed version is a "cooker" build
|
||||
set_setting_value $rd_conf "update_repo" "RetroDECK-cooker" retrodeck "options"
|
||||
set_setting_value $rd_conf "update_check" "true" retrodeck "options"
|
||||
update_ignore=$(curl --silent "https://api.github.com/repos/XargonWan/RetroDECK-cooker/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
|
||||
update_ignore=$(curl --silent "https://api.github.com/repos/XargonWan/$update_repo/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
|
||||
set_setting_value $rd_conf "update_ignore" "$update_ignore" retrodeck "options" # Store the latest online version to ignore for future checks, as internal version and online tag version may not match up.
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -1104,7 +1104,7 @@ modules:
|
|||
- mkdir -p /app/tools
|
||||
- cp tools/configurator.sh /app/tools/configurator.sh
|
||||
- chmod +x /app/tools/configurator.sh
|
||||
- cp es-configs/tools-gamelist.xml /app/retrodeck/tools-gamelist.xml
|
||||
#- cp es-configs/tools-gamelist.xml /app/retrodeck/tools-gamelist.xml
|
||||
- cp tools/retrodeck_function_wrapper.sh /app/tools/retrodeck_function_wrapper.sh
|
||||
- chmod +x /app/tools/retrodeck_function_wrapper.sh
|
||||
|
||||
|
|
@ -1137,4 +1137,4 @@ modules:
|
|||
sources:
|
||||
- type: git
|
||||
url: https://github.com/XargonWan/RetroDECK.git
|
||||
branch: cooker-0.7.0b
|
||||
branch: cooker-0.7.0b
|
||||
|
|
|
|||
|
|
@ -91,12 +91,8 @@ post_update() {
|
|||
|
||||
dir_prep "$rdhome/gamelists" "/var/config/emulationstation/.emulationstation/gamelists"
|
||||
|
||||
if [[ $(configurator_generic_question_dialog "RetroDECK DOOM Addition" "RetroDECK now runs DOOM!\n\nIf you would like to have this classic game added to your library, smash that Yes button!") == "true" ]]; then
|
||||
cp "/app/retrodeck/extras/doom1.wad" "$roms_folder/doom/doom1.wad" # No -f in case the user already has it
|
||||
mkdir -p "/var/config/emulationstation/.emulationstation/gamelists/doom"
|
||||
cp -f "/app/retrodeck/rd_prepacks/doom/gamelist.xml" "/var/config/emulationstation/.emulationstation/gamelists/doom/gamelist.xml"
|
||||
mkdir -p "$media_folder/doom"
|
||||
unzip -oq "/app/retrodeck/rd_prepacks/doom/doom.zip" -d "$media_folder/doom/"
|
||||
if [[ $(configurator_generic_question_dialog "RetroDECK Starter Pack" "The RetroDECK creators have put together a collection of classic retro games you might enjoy!\n\nWould you like to have them automatically added to your library?\n\nThis can always be done later through the Configurator.") == "true" ]]; then
|
||||
install_retrodeck_starterpack
|
||||
fi
|
||||
|
||||
cp -f $emuconfigs/rpcs3/vfs.yml /var/config/rpcs3/vfs.yml
|
||||
|
|
@ -139,8 +135,7 @@ post_update() {
|
|||
|
||||
configurator_generic_dialog "RetroDECK 0.7.0b Upgrade" "As part of this update, we are offering a new official RetroDECK controller profile!\nIt is an optional component that helps you get the most out of RetroDECK with a new in-game radial menu for unified hotkeys across emulators.\n\nThe files need to be installed outside of the normal ~/retrodeck folder, so we wanted your permission before proceeding.\nIf you decide to not install the profile now, it can always be done later through the Configurator.\n\nThe files will be installed at the following shared Steam locations:\n\n$HOME/.steam/steam/tenfoot/resource/images/library/controller/binding_icons/\n$HOME/.steam/steam/controller_base/templates/RetroDECK_controller_config.vdf"
|
||||
if [[ $(configurator_generic_question_dialog "RetroDECK Official Controller Profile" "Would you like to install the official RetroDECK controller profile?") == "true" ]]; then
|
||||
rsync -a "/app/retrodeck/binding-icons/" "$HOME/.steam/steam/tenfoot/resource/images/library/controller/binding_icons/"
|
||||
cp -f "$emuconfigs/defaults/retrodeck/RetroDECK_controller_config.vdf" "$HOME/.steam/steam/controller_base/templates/RetroDECK_controller_config.vdf"
|
||||
install_retrodeck_controller_profile
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 717b78093797270877ec416e58082f1c71d435d8
|
||||
Subproject commit 0b1cfb79e591e10488a3262d6b38db843c39a409
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit a337dd0c6b7209a316dc6fa142323972e128c85d
|
||||
Subproject commit a2441b964afefd8cd1cebcdf562c7878670daf42
|
||||
|
|
@ -106,7 +106,7 @@ then
|
|||
echo "Config file's version is $version but the actual version is $hard_version"
|
||||
if grep -qF "cooker" <<< $hard_version; then # If newly-installed version is a "cooker" build
|
||||
cooker_base_version=$(echo $hard_version | cut -d'-' -f2)
|
||||
update_ignore=$(curl --silent "https://api.github.com/repos/XargonWan/RetroDECK-cooker/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
|
||||
update_ignore=$(curl --silent "https://api.github.com/repos/XargonWan/$update_repo/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
|
||||
set_setting_value $rd_conf "update_ignore" "$update_ignore" retrodeck "options" # Store the latest online version to ignore for future checks, as internal version and online tag version may not match up.
|
||||
choice=$(zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --ok-label="Upgrade" --extra-button="Don't Upgrade" --extra-button="Fresh Install" \
|
||||
--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
|
||||
|
|
|
|||
|
|
@ -813,9 +813,9 @@ configurator_tools_and_troubleshooting_dialog() {
|
|||
"Basic BIOS file check" "Show a list of systems that BIOS files are found for" \
|
||||
"Advanced BIOS file check" "Show advanced information about common BIOS files" \
|
||||
"Compress Games" "Compress games to CHD format for systems that support it" \
|
||||
"Download/Update Themes" "Download new themes for RetroDECK or update existing ones" \
|
||||
"Download PS3 Firmware" "Download PS3 firmware for use with the RPCS3 emulator" \
|
||||
"Install RetroDECK controller profile" "Install the custom RetroDECK controller profile and required icons" \
|
||||
"Install RetroDECK Starter Pack" "Install a small selection of classic games the RetroDECK creators picked themselves!" \
|
||||
"Backup RetroDECK Userdata" "Compress important RetroDECK user data folders" )
|
||||
|
||||
case $choice in
|
||||
|
|
@ -840,15 +840,6 @@ configurator_tools_and_troubleshooting_dialog() {
|
|||
configurator_compress_games_dialog
|
||||
;;
|
||||
|
||||
"Download/Update Themes" )
|
||||
if [[ $(check_network_connectivity) == "true" ]]; then
|
||||
configurator_online_theme_downloader
|
||||
else
|
||||
configurator_generic_dialog "You do not appear to currently have Internet access, which is required by this tool. Please try again when network access has been restored."
|
||||
configurator_tools_and_troubleshooting_dialog
|
||||
fi
|
||||
;;
|
||||
|
||||
"Download PS3 Firmware" )
|
||||
if [[ $(check_network_connectivity) == "true" ]]; then
|
||||
configurator_rpcs3_firmware_updater
|
||||
|
|
@ -861,13 +852,18 @@ configurator_tools_and_troubleshooting_dialog() {
|
|||
"Install RetroDECK controller profile" )
|
||||
configurator_generic_dialog "Starting with version 0.7.0b, we are offering a new official RetroDECK controller profile!\nIt is an optional component that helps you get the most out of RetroDECK with a new in-game radial menu for unified hotkeys across emulators.\n\nThe files need to be installed outside of the normal ~/retrodeck folder, so we wanted your permission before proceeding.\n\nThe files will be installed at the following shared Steam locations:\n\n$HOME/.steam/steam/tenfoot/resource/images/library/controller/binding_icons/\n$HOME/.steam/steam/controller_base/templates/RetroDECK_controller_config.vdf"
|
||||
if [[ $(configurator_generic_question_dialog "RetroDECK Official Controller Profile" "Would you like to install the official RetroDECK controller profile?") == "true" ]]; then
|
||||
rsync -a "/app/retrodeck/binding-icons/" "$HOME/.steam/steam/tenfoot/resource/images/library/controller/binding_icons/"
|
||||
cp -f "$emuconfigs/defaults/retrodeck/RetroDECK_controller_config.vdf" "$HOME/.steam/steam/controller_base/templates/RetroDECK_controller_config.vdf"
|
||||
install_retrodeck_controller_profile
|
||||
fi
|
||||
configurator_generic_dialog "The RetroDECK controller profile install is complete.\nSee the Wiki for more details on how to use it to its fullest potential!"
|
||||
configurator_tools_and_troubleshooting_dialog
|
||||
;;
|
||||
|
||||
"Install RetroDECK Starter Pack" )
|
||||
install_retrodeck_starterpack
|
||||
configurator_generic_dialog "RetroDECK Configurator - Install RetroDECK Starter Pack" "The RetroDECK starter pack has been installed. We hope you enjoy it!"
|
||||
configurator_tools_and_troubleshooting_dialog
|
||||
;;
|
||||
|
||||
"Backup RetroDECK Userdata" )
|
||||
configurator_generic_dialog "This tool will compress important RetroDECK userdata (basically everything except the ROMs folder) into a zip file.\n\nThis process can take several minutes, and the resulting zip file can be found in the ~/retrodeck/backups folder."
|
||||
(
|
||||
|
|
|
|||
Loading…
Reference in a new issue