Bugfixes by RavenKilit

This commit is contained in:
XargonWan 2022-09-24 20:28:49 +02:00 committed by GitHub
parent d3520503e9
commit 8980d9cbb4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 66 additions and 64 deletions

View file

@ -79,6 +79,9 @@ then
echo "themes_folder=$themes_folder" >> $rd_conf echo "themes_folder=$themes_folder" >> $rd_conf
echo "sdcard=$sdcard" >> $rd_conf echo "sdcard=$sdcard" >> $rd_conf
echo "Setting config file permissions"
chmod +rwx $rd_conf
# If the config file is existing i just read the variables (source it) # If the config file is existing i just read the variables (source it)
else else
echo "Found RetroDECK config file in $rd_conf" echo "Found RetroDECK config file in $rd_conf"

View file

@ -1386,6 +1386,9 @@ modules:
buildsystem: simple buildsystem: simple
build-commands: build-commands:
# Initializing retrodeck config folder
- mkdir -p /var/config/retrodeck
# Prep the ES-DE and RetroArch config files - I will have to SED/XMLSTARLET them soon # Prep the ES-DE and RetroArch config files - I will have to SED/XMLSTARLET them soon
- rm -rf /app/share/emulationstation/resources/systems/unix/es_find_rules.xml - rm -rf /app/share/emulationstation/resources/systems/unix/es_find_rules.xml
- cp es-configs/es_find_rules.xml /app/share/emulationstation/resources/systems/unix/ - cp es-configs/es_find_rules.xml /app/share/emulationstation/resources/systems/unix/

View file

@ -169,7 +169,7 @@ standalones_init() {
cp -fv $emuconfigs/ppssppsdl/* /var/config/ppsspp/PSP/SYSTEM/ cp -fv $emuconfigs/ppssppsdl/* /var/config/ppsspp/PSP/SYSTEM/
sed -i 's#/home/deck/retrodeck#'$rdhome'#g' /var/config/ppsspp/PSP/SYSTEM/ppsspp.ini sed -i 's#/home/deck/retrodeck#'$rdhome'#g' /var/config/ppsspp/PSP/SYSTEM/ppsspp.ini
# PPSSPPSDL # DUCKSTATION
echo "------------------------" echo "------------------------"
echo "Initializing DUCKSTATION" echo "Initializing DUCKSTATION"
echo "------------------------" echo "------------------------"
@ -299,40 +299,40 @@ browse(){
done done
} }
advanced(){ #advanced(){
# function to give advanced install options # # function to give advanced install options
echo "Advaced choosed" # echo "Advaced choosed"
#
choice=$(zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap \ # choice=$(zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap \
--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" \ # --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" \
--ok-label "ROMs" \ # --ok-label "ROMs" \
--extra-button "Media" \ # --extra-button "Media" \
--extra-button "Themes" \ # --extra-button "Themes" \
--extra-button "Back" \ # --extra-button "Back" \
--text="What do you want to change?\n\nROMS folder = $roms_folder\nMedia folder (scraped data) = $media_folder\nThemes folder=$themes_folder" ) # --text="What do you want to change?\n\nROMS folder = $roms_folder\nMedia folder (scraped data) = $media_folder\nThemes folder=$themes_folder" )
echo "Choice is $choice" # echo "Choice is $choice"
#
case $choice in # case $choice in
#
"" ) # Internal (yes) # "" ) # Internal (yes)
echo "ROMs" # echo "ROMs"
;; # ;;
#
"Media" ) # "Media" )
echo "Media" # echo "Media"
;; # ;;
#
"Themes" ) # "Themes" )
echo "Themes" # echo "Themes"
;; # ;;
#
"Back" ) # Browse + not found fallback # "Back" ) # Browse + not found fallback
echo "Back" # echo "Back"
finit # finit
;; # ;;
#
esac # esac
} #}
finit() { finit() {
# Force/First init, depending on the situation # Force/First init, depending on the situation
@ -342,25 +342,25 @@ finit() {
# Internal or SD Card? # Internal or SD Card?
choice=$(zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap \ choice=$(zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap \
--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" \
--ok-label "Internal" \ --ok-label "Cancel" \
--extra-button "Internal" \
--extra-button "SD Card" \ --extra-button "SD Card" \
--extra-button "Advanced" \ #--extra-button "Advanced" \
--extra-button "Cancel" \
--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?" ) --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" echo "Choice is $choice"
case $choice in case $choice in
"" ) # Internal (yes) "" ) # Cancel or X button quits
echo "Internal selected"
roms_folder="$rdhome/roms"
;;
"Cancel" )
echo "Now quitting" echo "Now quitting"
kill $$ kill $$
;; ;;
"Internal" ) # Internal
echo "Internal selected"
roms_folder="$rdhome/roms"
;;
"SD Card" ) "SD Card" )
echo "SD Card selected" echo "SD Card selected"
if [ ! -d "$sdcard" ] # SD Card path is not existing if [ ! -d "$sdcard" ] # SD Card path is not existing
@ -378,14 +378,10 @@ finit() {
fi fi
;; ;;
"Advanced" ) # Browse + not found fallback #"Advanced" ) # Browse + not found fallback
echo "Advanced" # echo "Advanced"
advanced # advanced
;; #;;
1 ) # X button quits
kill $$
;;
esac esac