mirror of
https://github.com/RetroDECK/RetroDECK.git
synced 2024-11-24 23:15:39 +00:00
merge upsteam branch/cooker-0.8.3b
This commit is contained in:
icenine451
commit
5d9b306671
1
.github/workflows/cooker-selfhosted.yml
vendored
1
.github/workflows/cooker-selfhosted.yml
vendored
|
|
@ -5,6 +5,7 @@ on:
|
|||
branches:
|
||||
- cooker*
|
||||
- feat*
|
||||
- branch/cooker*
|
||||
paths:
|
||||
- '.github/workflows/**'
|
||||
- 'automation_tools/**'
|
||||
|
|
|
|||
|
|
@ -304,7 +304,7 @@ post_update() {
|
|||
log i "In version 0.8.1b, the following changes were made that required config file updates/reset or other changes to the filesystem:"
|
||||
log i "- ES-DE files were moved inside the retrodeck folder, migrating to the new structure"
|
||||
log i "- Give the user the option to reset Ryujinx, which was not properly initialized in 0.8.0b"
|
||||
|
||||
|
||||
log d "ES-DE files were moved inside the retrodeck folder, migrating to the new structure"
|
||||
dir_prep "$rdhome/ES-DE/collections" "/var/config/ES-DE/collections"
|
||||
dir_prep "$rdhome/ES-DE/gamelists" "/var/config/ES-DE/gamelists"
|
||||
|
|
@ -349,6 +349,36 @@ post_update() {
|
|||
ln -sv $ryujinxconf "$(dirname $ryujinxconf)/PRConfig.json"
|
||||
fi
|
||||
|
||||
if [[ $(check_version_is_older_than "0.8.3b") == "true" ]]; then
|
||||
# In version 0.8.3b, the following changes were made:
|
||||
# - Recovery from a failed move of the themes, downloaded_media and gamelists folder to their new ES-DE locations.
|
||||
if [[ !-d "$rdhome/ES-DE/themes" || ! -d "$rdhome/ES-DE/downloaded_media" || ! -d "$rdhome/ES-DE/gamelists" || ! -d "$rdhome/ES-DE/collections" ]]; then
|
||||
log i "Moving ES-DE downloaded_media, gamelist, and themes from \"$rdhome\" to \"$rdhome/ES-DE\" due to a RetroDECK Framework bug"
|
||||
if [[ -d "$rdhome/themes" && ! -d "$rdhome/ES-DE/themes" ]]; then
|
||||
move "$rdhome/themes" "$rdhome/ES-DE/themes" && log d "Move of \"$rdhome/themes\" completed"
|
||||
else
|
||||
log i "ES-DE themes appears to already have been migrated."
|
||||
fi
|
||||
if [[ -d "$rdhome/downloaded_media" && ! -d "$rdhome/ES-DE/downloaded_media" ]]; then
|
||||
move "$rdhome/downloaded_media" "$rdhome/ES-DE/downloaded_media" && log d "Move of \"$rdhome/downloaded_media\" completed"
|
||||
else
|
||||
log i "ES-DE downloaded media appears to already have been migrated."
|
||||
fi
|
||||
if [[ -d "$rdhome/gamelists" && ! -d "$rdhome/ES-DE/gamelists" ]]; then
|
||||
move "$rdhome/gamelists" "$rdhome/ES-DE/gamelists" && log d "Move of \"$rdhome/gamelists/\" completed"
|
||||
else
|
||||
log i "ES-DE gamelists appears to already have been migrated."
|
||||
fi
|
||||
if [[ -d "$rdhome/collections" && ! -d "$rdhome/ES-DE/collections" ]]; then
|
||||
move "$rdhome/collections" "$rdhome/ES-DE/collections" && log d "Move of \"$rdhome/collections/\" completed"
|
||||
else
|
||||
log i "ES-DE collections appears to already have been migrated."
|
||||
fi
|
||||
else
|
||||
log i "ES-DE folders appears to already have been migrated."
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ $(check_version_is_older_than "0.8.3b") == "true" ]]; then
|
||||
# In version 0.8.3b, the following changes were made:
|
||||
# - Recovery from a failed move of the themes, downloaded_media and gamelists folder to their new ES-DE locations.
|
||||
|
|
|
|||
|
|
@ -67,7 +67,21 @@
|
|||
<project_license>GPL-3.0</project_license>
|
||||
<metadata_license>CC0-1.0</metadata_license>
|
||||
<releases>
|
||||
<release version="0.8.2b" date="2024-07-17">
|
||||
<release version="0.8.3b" date="2024-07-22">
|
||||
<url>https://github.com/XargonWan/RetroDECK/releases/tag/0.8.3b</url>
|
||||
<description>
|
||||
<p>Big fixes:</p>
|
||||
<ul>
|
||||
<li>Fixed a bug where the ES-DE folders where not correctly migrated from retrodeck folder to retrodeck/ES-DE folder</li>
|
||||
</ul>
|
||||
<p>Known issues:</p>
|
||||
<ul>
|
||||
<li>Ryujinx is broken in this version, we plan to fix it soon, check the known issues to learn more</li>
|
||||
<li>Please check the know issues in the Wiki under General Information</li>
|
||||
</ul>
|
||||
</description>
|
||||
</release>
|
||||
<release version="0.8.2b" date="2024-07-18">
|
||||
<url>https://github.com/XargonWan/RetroDECK/releases/tag/0.8.2b</url>
|
||||
<description>
|
||||
<p>Changes:</p>
|
||||
|
|
@ -89,7 +103,8 @@
|
|||
</ul>
|
||||
<p>Known issues:</p>
|
||||
<ul>
|
||||
<li>Please check the know issues in the Wiki under General Information.</li>
|
||||
<li>Ryujinx is broken in this version, we plan to fix it soon, check the known issues to learn more</li>
|
||||
<li>Please check the know issues in the Wiki under General Information</li>
|
||||
</ul>
|
||||
</description>
|
||||
</release>
|
||||
|
|
|
|||
|
|
@ -68,8 +68,8 @@ modules:
|
|||
# The version number is hardcoded in /app/retrodeck/version
|
||||
#
|
||||
# UPDATE STEPS FOR MAIN:
|
||||
# [ ] Update the VERSION variable on line containing "VERSION=THISBRANCH"
|
||||
# [ ] Update the appdata.xml with the version number and notes
|
||||
# [X] Update the VERSION variable on line containing "VERSION=THISBRANCH"
|
||||
# [X] Update the appdata.xml with the version number and notes
|
||||
#
|
||||
- name: version-initialization
|
||||
buildsystem: simple
|
||||
|
|
@ -77,8 +77,8 @@ modules:
|
|||
- |
|
||||
|
||||
# on main please update this with the version variable, eg: VERSION=0.8.0b
|
||||
# on cooker will be VERSION=cooker-0.9.0b for example
|
||||
VERSION=cooker-0.8.2b
|
||||
# on cooker will be THISBRANCH
|
||||
VERSION=cooker-0.8.3b
|
||||
|
||||
git checkout ${GITHUB_REF_NAME}
|
||||
mkdir -p ${FLATPAK_DEST}/retrodeck/
|
||||
|
|
@ -1232,21 +1232,34 @@ modules:
|
|||
# url: https://github.com/Ryujinx/release-channel-master/releases/download/1.1.1343/ryujinx-1.1.1343-linux_x64.tar.gz
|
||||
# sha256: 3cd2172d2f42a0fb93a83bffe6bd8fb2d1d81fb45afc80e0068a245c8f755ac1
|
||||
|
||||
- name: Ryujinx-with-symlink-fix
|
||||
# - name: Ryujinx-with-symlink-fix
|
||||
# buildsystem: simple
|
||||
# build-commands:
|
||||
# - |
|
||||
# mkdir -p ${FLATPAK_DEST}/ryujinx
|
||||
# mkdir -p ${FLATPAK_DEST}/bin
|
||||
# chmod +x Ryujinx.sh
|
||||
# chmod +x Ryujinx
|
||||
# mv -v * ${FLATPAK_DEST}/ryujinx
|
||||
# ln -sv ${FLATPAK_DEST}/ryujinx/Ryujinx.sh ${FLATPAK_DEST}/bin/Ryujinx.sh
|
||||
# chmod +x ${FLATPAK_DEST}/bin/Ryujinx.sh
|
||||
# sources:
|
||||
# - type: archive
|
||||
# url: https://gitlab.com/-/project/59825450/uploads/8519a04d7a3f5b5949f14b6ad25a4185/ryujinx-Release-1.1.0+81fd228-linux_x64.zip
|
||||
# sha256: 9e4a4393a3dcc44fda2aec40c2842492e30656c7369a9959d865a3351f12eeb9
|
||||
|
||||
# This version was reported as working with symlinks: https://discord.com/channels/951662718102962256/951715885968654418/1264882000658169866
|
||||
- name: Ryujinx-reported-working-version
|
||||
buildsystem: simple
|
||||
build-commands:
|
||||
- |
|
||||
mkdir -p ${FLATPAK_DEST}/ryujinx
|
||||
mkdir -p ${FLATPAK_DEST}/bin
|
||||
chmod +x Ryujinx.sh
|
||||
chmod +x Ryujinx
|
||||
mv -v * ${FLATPAK_DEST}/ryujinx
|
||||
ln -sv ${FLATPAK_DEST}/ryujinx/Ryujinx.sh ${FLATPAK_DEST}/bin/Ryujinx.sh
|
||||
chmod +x ${FLATPAK_DEST}/bin/Ryujinx.sh
|
||||
tar -zxvf *.tar.gz
|
||||
mv -v publish ${FLATPAK_DEST}/ryujinx
|
||||
ln -sv ${FLATPAK_DEST}/ryujinx/Ryujinx ${FLATPAK_DEST}/bin/Ryujinx.sh
|
||||
sources:
|
||||
- type: archive
|
||||
url: https://gitlab.com/-/project/59825450/uploads/8519a04d7a3f5b5949f14b6ad25a4185/ryujinx-Release-1.1.0+81fd228-linux_x64.zip
|
||||
sha256: 9e4a4393a3dcc44fda2aec40c2842492e30656c7369a9959d865a3351f12eeb9
|
||||
- type: file
|
||||
url: https://github.com/Ryujinx/release-channel-master/releases/download/1.1.1297/ryujinx-1.1.1297-linux_x64.tar.gz
|
||||
sha256: 28b38754e7d2e92083b313b23278c180ae54ac025edbbd0276ec03baec0cec0f
|
||||
|
||||
# Ryujinx Appimage - END
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue