diff --git a/global.sh b/global.sh
index 60635e28..90a23ba6 100755
--- a/global.sh
+++ b/global.sh
@@ -67,12 +67,15 @@ conf_write() {
# If there is no config file I initalize the file with the the default values
if [ ! -f "$rd_conf" ]
then
-
+
+ mkdir -p /var/config/retrodeck
echo "RetroDECK config file not found in $rd_conf"
echo "Initializing"
-
+
# Initializing the variables
- version="$hard_version" # if we are here means that the we are in a new installation, so the version is valorized with the hardcoded one
+ if [ -z $version]; then
+ version="$hard_version" # if we are here means that the we are in a new installation, so the version is valorized with the hardcoded one
+ fi
rdhome="$HOME/retrodeck" # the retrodeck home, aka ~/retrodeck
roms_folder="$rdhome/roms" # the default roms folder path
saves_folder="$rdhome/saves" # the default saves folder path
@@ -100,4 +103,4 @@ else
echo "Found RetroDECK config file in $rd_conf"
echo "Loading it"
source "$rd_conf"
-fi
\ No newline at end of file
+fi
diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml
index c2b9104f..fb07f2b5 100644
--- a/net.retrodeck.retrodeck.appdata.xml
+++ b/net.retrodeck.retrodeck.appdata.xml
@@ -14,19 +14,25 @@
- https://github.com/XargonWan/RetroDECK/blob/main/res/logo.png?raw=true
+ https://github.com/XargonWan/RetroDECK/blob/cooker/res/logo.png?raw=true
- https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen02.png?raw=true
+ https://github.com/XargonWan/RetroDECK/blob/cooker/res/screenshots/screen01.jpeg?raw=true
- https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen03.png?raw=true
+ https://github.com/XargonWan/RetroDECK/blob/cooker/res/screenshots/screen02.jpeg?raw=true
- https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen04.png?raw=true
+ https://github.com/XargonWan/RetroDECK/blob/cooker/res/screenshots/screen03.jpeg?raw=true
- https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen05.png?raw=true
+ https://github.com/XargonWan/RetroDECK/blob/cooker/res/screenshots/screen04.jpeg?raw=true
+
+
+ https://github.com/XargonWan/RetroDECK/blob/cooker/res/screenshots/screen05.jpeg?raw=true
+
+
+ https://github.com/XargonWan/RetroDECK/blob/cooker/res/screenshots/screen06.jpeg?raw=true
@@ -68,7 +74,7 @@
IMPORTANT: Started saves migration, the saves are being moved to retrodeck/saves/systemname/emulator upon update, however if some emulators cannot load your saves you have to move them manually to the new path
Theme revamp and more themes available such as the old one
-
Updated RetroArch and its cores from 1.10.2 to 1.11.0
+
Updated RetroArch and its cores from 1.10.2 to 1.11.1
Updated all the standalone emulators to their latest releases
Updated ES-DE to 1.2.6
Removed the unavailable emulators from the ES-DE list to avoid confusion
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index a8620a46..a9fa98cd 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -67,6 +67,7 @@ modules:
# [ ] Update the VERSION variable
# [ ] Update the appdata.xml with the version number and notes
# [ ] change branch into main in retrodeck module (last one)
+ # [ ] change the screenshots link from cooker to main
#
- name: version-initialization
buildsystem: simple
@@ -289,7 +290,7 @@ modules:
sources:
- type: git
url: https://github.com/libretro/RetroArch.git
- commit: 9586d679a8b143fbe1880dff7454fd0809262b55
+ commit: 389ef31a8f4a505f255e9bfebe882750d22ab490
- type: file
path: rd-submodules/retroarch/retroarch.cfg
post-install:
@@ -322,7 +323,7 @@ modules:
sources:
- type: git
url: https://github.com/libretro/RetroArch.git
- commit: 9586d679a8b143fbe1880dff7454fd0809262b55
+ commit: 389ef31a8f4a505f255e9bfebe882750d22ab490
- name: retroarch-filers-audio
subdir: libretro-common/audio/dsp_filters
make-install-args:
@@ -330,7 +331,7 @@ modules:
sources:
- type: git
url: https://github.com/libretro/RetroArch.git
- commit: 9586d679a8b143fbe1880dff7454fd0809262b55
+ commit: 389ef31a8f4a505f255e9bfebe882750d22ab490
- name: retroarch-assets
make-install-args:
- PREFIX=${FLATPAK_DEST}
@@ -351,7 +352,7 @@ modules:
sources:
- type: git
url: https://github.com/libretro/libretro-core-info.git
- commit: 0cc4912691cd1adb87168ce87b6795bdf57b2fe5
+ commit: 90eff5d4e72db1b5929af7210c9b665c33034536
- name: retroarch-joypad-autoconfig
make-install-args:
- PREFIX=${FLATPAK_DEST}
@@ -398,8 +399,8 @@ modules:
- mv ./RetroArch-Linux-x86_64.AppImage.home/.config/retroarch/cores/* /app/share/libretro/cores/
sources:
- type: archive
- url: https://buildbot.libretro.com/stable/1.11.0/linux/x86_64/RetroArch_cores.7z
- sha256: a443c18708b3eda12bdc3419e1aaf9d95370580a38f23d0abfa7868b84ff6fdc
+ url: https://buildbot.libretro.com/stable/1.11.1/linux/x86_64/RetroArch_cores.7z
+ sha256: fa98c9a5b3aab2b4808ce14726be0393cad36bd033ffe4b8378b7d5e5dede448
# PPSSPP - START
# https://github.com/flathub/org.ppsspp.PPSSPP
@@ -958,8 +959,8 @@ modules:
- ln -s "${FLATPAK_DEST}/pcsx2-qt/usr/bin/pcsx2-qt" "${FLATPAK_DEST}/bin/pcsx2-qt"
sources:
- type: file
- url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.3357/pcsx2-v1.7.3357-linux-AppImage-64bit-AVX2-Qt.AppImage
- sha256: 07f293c1aad832f0a908c18ff94c8b545db0cb56230b4f4574ba75071bd91441
+ url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.3366/pcsx2-v1.7.3366-linux-AppImage-64bit-AVX2-Qt.AppImage
+ sha256: 00790594de30929a11056b95d89650cbf523cc2bb1dc27df3a99e215722ec90c
# PCSX2 - END
@@ -1400,8 +1401,8 @@ modules:
# Logo, res
- rm -f /app/share/emulationstation/resources/graphics/splash.svg
- - cp res/splash.svg /app/share/emulationstation/resources/graphics/splash.svg
- - cp res/icon.svg /app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg
+ - cp -f res/splash.svg /app/share/emulationstation/resources/graphics/splash.svg
+ - cp -f res/icon.svg /app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg
# Tools
- mkdir -p ${FLATPAK_DEST}/retrodeck/tools/
diff --git a/res/screenshots/screen01.jpeg b/res/screenshots/screen01.jpeg
new file mode 100644
index 00000000..d1439cc1
Binary files /dev/null and b/res/screenshots/screen01.jpeg differ
diff --git a/res/screenshots/screen01.png b/res/screenshots/screen01.png
deleted file mode 100755
index f77c7caa..00000000
Binary files a/res/screenshots/screen01.png and /dev/null differ
diff --git a/res/screenshots/screen02.jpeg b/res/screenshots/screen02.jpeg
new file mode 100644
index 00000000..7d3975bf
Binary files /dev/null and b/res/screenshots/screen02.jpeg differ
diff --git a/res/screenshots/screen02.png b/res/screenshots/screen02.png
deleted file mode 100644
index 5d9ad67c..00000000
Binary files a/res/screenshots/screen02.png and /dev/null differ
diff --git a/res/screenshots/screen03.jpeg b/res/screenshots/screen03.jpeg
new file mode 100644
index 00000000..fbcd8b1b
Binary files /dev/null and b/res/screenshots/screen03.jpeg differ
diff --git a/res/screenshots/screen03.png b/res/screenshots/screen03.png
deleted file mode 100755
index 643cfd90..00000000
Binary files a/res/screenshots/screen03.png and /dev/null differ
diff --git a/res/screenshots/screen04.jpeg b/res/screenshots/screen04.jpeg
new file mode 100644
index 00000000..0e3b97e5
Binary files /dev/null and b/res/screenshots/screen04.jpeg differ
diff --git a/res/screenshots/screen04.png b/res/screenshots/screen04.png
deleted file mode 100755
index a29e9829..00000000
Binary files a/res/screenshots/screen04.png and /dev/null differ
diff --git a/res/screenshots/screen05.jpeg b/res/screenshots/screen05.jpeg
new file mode 100644
index 00000000..81e9b2d3
Binary files /dev/null and b/res/screenshots/screen05.jpeg differ
diff --git a/res/screenshots/screen05.png b/res/screenshots/screen05.png
deleted file mode 100755
index 2741d53b..00000000
Binary files a/res/screenshots/screen05.png and /dev/null differ
diff --git a/res/screenshots/screen06.jpeg b/res/screenshots/screen06.jpeg
new file mode 100644
index 00000000..263bcac0
Binary files /dev/null and b/res/screenshots/screen06.jpeg differ
diff --git a/res/splash.svg b/res/splash.svg
index 0a2cfb46..0ce56577 100644
--- a/res/splash.svg
+++ b/res/splash.svg
@@ -1,48 +1,24 @@
-
-
-
+
+
\ No newline at end of file
diff --git a/retrodeck.sh b/retrodeck.sh
index d7831401..747e59d4 100644
--- a/retrodeck.sh
+++ b/retrodeck.sh
@@ -1,5 +1,15 @@
#!/bin/bash
+# workaround to fix a bug when updating to 0.5.0b where the post update is not triggered
+# basically from 0.5 it's not reading the version from the lockfile so it doesn't know from which version it came from and the new rule of global.sh is that if version is unknown it's like a first boot
+# remove it in the future
+lockfile="/var/config/retrodeck/.lock"
+if [[ $(cat $lockfile) == *"0.4."* ]] || [[ $(cat $lockfile) == *"0.3."* ]] || [[ $(cat $lockfile) == *"0.2."* ]] || [[ $(cat $lockfile) == *"0.1."* ]]
+then
+ echo "Running version workaround"
+ version=$(cat $lockfile)
+fi
+
source /app/bin/global.sh
# We moved the lockfile in /var/config/retrodeck in order to solve issue #53 - Remove in a few versions
@@ -54,9 +64,10 @@ dir_prep() {
tools_init() {
rm -rfv /var/config/retrodeck/tools/
mkdir -pv /var/config/retrodeck/tools/
- cp -r /app/retrodeck/tools/* /var/config/retrodeck/tools/
+ cp -rfv /app/retrodeck/tools/* /var/config/retrodeck/tools/
mkdir -pv /var/config/emulationstation/.emulationstation/custom_systems/tools/
- cp /app/retrodeck/tools-gamelist.xml /var/config/retrodeck/tools/gamelist.xml
+ rm -rfv /var/config/retrodeck/tools/gamelist.xml
+ cp -fv /app/retrodeck/tools-gamelist.xml /var/config/retrodeck/tools/gamelist.xml
}
standalones_init() {
@@ -258,7 +269,7 @@ post_update() {
mkdir -pv $rdhome/.logs #this was added later, maybe safe to remove in a few versions
- # Resetting es_systems, now we need it but in the future I should think a better solution, maybe with sed
+ # Resetting es_settings, now we need it but in the future I should think a better solution, maybe with sed
cp -fv /app/retrodeck/es_settings.xml /var/config/emulationstation/.emulationstation/es_settings.xml
@@ -463,7 +474,6 @@ finit() {
--ok-label "Cancel" \
--extra-button "Internal" \
--extra-button "SD Card" \
- #--extra-button "Advanced" \
--text="Welcome to the first configuration of RetroDECK.\nThe setup will be quick but please READ CAREFULLY each message in order to avoid misconfigurations.\n\nWhere do you want your roms folder to be located?" )
echo "Choice is $choice"
diff --git a/to-be-deleted/start-citra.sh b/to-be-deleted/start-citra.sh
deleted file mode 100644
index f551da09..00000000
--- a/to-be-deleted/start-citra.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-zenity --title "RetroDECK" --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --text="Doing some changes in the emulator's configuration may create serious issues,\nplease continue only if you know what you're doing.\n\nDo you want to continue?"
-if [ $? == 0 ]
-then
- citra-qt
-fi
\ No newline at end of file
diff --git a/to-be-deleted/start-dolphin.sh b/to-be-deleted/start-dolphin.sh
deleted file mode 100644
index 99d1a671..00000000
--- a/to-be-deleted/start-dolphin.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-zenity --title "RetroDECK" --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --text="Doing some changes in the emulator's configuration may create serious issues,\nplease continue only if you know what you're doing.\n\nDo you want to continue?"
-if [ $? == 0 ]
-then
- dolphin-emu
-fi
\ No newline at end of file
diff --git a/to-be-deleted/start-melonds.sh b/to-be-deleted/start-melonds.sh
deleted file mode 100644
index eec54c16..00000000
--- a/to-be-deleted/start-melonds.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-zenity --title "RetroDECK" --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --text="Doing some changes in the emulator's configuration may create serious issues,\nplease continue only if you know what you're doing.\n\nDo you want to continue?"
-if [ $? == 0 ]
-then
- melonDS
-fi
\ No newline at end of file
diff --git a/to-be-deleted/start-pcsx2.sh b/to-be-deleted/start-pcsx2.sh
deleted file mode 100644
index 4d2a7b69..00000000
--- a/to-be-deleted/start-pcsx2.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-zenity --title "RetroDECK" --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --text="Doing some changes in the emulator's configuration may create serious issues,\nplease continue only if you know what you're doing.\n\nDo you want to continue?"
-if [ $? == 0 ]
-then
- pcsx2
-fi
\ No newline at end of file
diff --git a/to-be-deleted/start-ppsspp.sh b/to-be-deleted/start-ppsspp.sh
deleted file mode 100644
index 6343ba15..00000000
--- a/to-be-deleted/start-ppsspp.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-zenity --title "RetroDECK" --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --text="Doing some changes in the emulator's configuration may create serious issues,\nplease continue only if you know what you're doing.\n\nDo you want to continue?"
-if [ $? == 0 ]
-then
- PPSSPPSDL
-fi
\ No newline at end of file
diff --git a/to-be-deleted/start-retroarch.sh b/to-be-deleted/start-retroarch.sh
deleted file mode 100644
index 5e3111e7..00000000
--- a/to-be-deleted/start-retroarch.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-zenity --title "RetroDECK" --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --text="Doing some changes in the RetroArch configuration may create serious issues,\nplease continue only if you know what you're doing.\n\nDo you want to continue?"
-if [ $? == 0 ]
-then
- retroarch
-fi
\ No newline at end of file
diff --git a/to-be-deleted/start-rpcs3.sh b/to-be-deleted/start-rpcs3.sh
deleted file mode 100644
index d560b202..00000000
--- a/to-be-deleted/start-rpcs3.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-zenity --title "RetroDECK" --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --text="Doing some changes in the emulator's configuration may create serious issues,\nplease continue only if you know what you're doing.\n\nDo you want to continue?"
-if [ $? == 0 ]
-then
- rpcs3
-fi
\ No newline at end of file
diff --git a/to-be-deleted/start-splore.sh b/to-be-deleted/start-splore.sh
deleted file mode 100644
index 0803b113..00000000
--- a/to-be-deleted/start-splore.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-if [ -d ~/retrodeck/roms/pico-8 ]; then
- pico_folder=~/retrodeck/roms/pico-8
-elif [ -d /run/media/mmcblk0p1/retrodeck/roms/pico-8 ]; then
- pico_folder=/run/media/mmcblk0p1/retrodeck/roms/pico-8
-fi
-
-echo $pico_folder > ~/retrodeck/.logs/retrodeck.log
-~/retrodeck/bios/pico-8/pico8 -desktop ~/retrodeck/screenshots -windowed 0 -home ~/retrodeck/bios/pico-8 -root_path $pico_folder -splore >> ~/retrodeck/.logs/retrodeck.log
diff --git a/to-be-deleted/start-yuzu.sh b/to-be-deleted/start-yuzu.sh
deleted file mode 100644
index e9150ff0..00000000
--- a/to-be-deleted/start-yuzu.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-zenity --title "RetroDECK" --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --text="Doing some changes in the emulator's configuration may create serious issues,\nplease continue only if you know what you're doing.\n\nDo you want to continue?"
-if [ $? == 0 ]
-then
- yuzu
-fi
\ No newline at end of file