Emulation/EmuDeck
1
0
Fork 0
mirror of https://github.com/dragoonDorise/EmuDeck.git synced 2024-05-20 05:10:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Various tweaks: desktop icons, configs, uninstall (#1034)

Browse source 
* ES-DE/SRM/Model 2: Fixed desktop icons + names
* Updated EmulationStation-DE to ES-DE where possible
* Updated ES-DE's settings file directory
* Updated uninstall script to match new desktop icons
* Tidied uninstall script
This commit is contained in:
rawdatafeel 2024-02-27 11:17:30 -05:00 committed by GitHub
parent db5f8d0f04
commit d2a07ed59f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 58 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
configs/steam-rom-manager/userData/parsers/emudeck/0_emulationstationde.json → configs/steam-rom-manager/userData/parsers/emudeck/0_es-de.json
View file

@ -1,13 +1,13 @@
{
"parserType": "Glob",
"configTitle": "ES-DE - EmulationStation-DE",
"configTitle": "ES-DE",
"steamDirectory": "${steamdirglobal}",
"steamCategory": "${Emulation}",
"romDirectory": "/run/media/mmcblk0p1/Emulation/tools/launchers/esde/",
"romDirectory": "/run/media/mmcblk0p1/Emulation/tools/launchers/es-de/",
"executableArgs": "",
"executableModifier": "\"${exePath}\"",
"startInDirectory": "",
"titleModifier": "EmulationStation DE",
"titleModifier": "ES-DE",
"fetchControllerTemplatesButton": null,
"removeControllersButton": null,
"imageProviders": ["SteamGridDB"],
@ -17,7 +17,7 @@
"specifiedAccounts": ""
},
"executable": {
"path": "/run/media/mmcblk0p1/Emulation/tools/launchers/esde/emulationstationde.sh",
"path": "/run/media/mmcblk0p1/Emulation/tools/launchers/es-de/es-de.sh",
"shortcutPassthrough": false,
"appendArgsToExecutable": true
},

20
functions/EmuScripts/emuDeckModel2.sh
View file

@ -1,6 +1,6 @@
#!/bin/bash
#variables
Model2_emuName="Model 2 (Proton)"
Model2_emuName="Model-2-Emulator"
Model2_emuType="$emuDeckEmuTypeWindows"
Model2_emuPath="${romsPath}/model2/EMULATOR.EXE"
Model2_configFile="${romsPath}/model2/EMULATOR.INI"
@ -32,7 +32,12 @@ Model2_install(){
return 1
fi
cp "$EMUDECKGIT/tools/launchers/model2.sh" "$toolsPath/launchers/model2.sh"
cp "$EMUDECKGIT/tools/launchers/model2.sh" "$toolsPath/launchers/model2.sh"
createDesktopShortcut "$HOME/.local/share/applications/Model 2 Emulator (Proton).desktop" \
"$Model2_emuName (Proton)" \
"${toolsPath}/launchers/model2.sh" \
"False"
}
@ -46,20 +51,11 @@ Model2_init(){
rsync -avhp "$EMUDECKGIT/configs/model2/" "${romsPath}/model2" --backup --suffix=.bak
Model2_addESConfig
Model2_downloadProtonGE
Model2_createDesktopShortcut
Model2ULWGL_install
}
Model2_createDesktopShortcut(){
createDesktopShortcut "$HOME/.local/share/applications/Model 2 (Proton).desktop" \
"Model 2 Emulator (Proton)" \
"${toolsPath}/launchers/model2.sh" \
"False"
}
Model2_addESConfig(){
if [[ $(grep -rnw "$es_systemsFile" -e 'model2') == "" ]]; then
@ -107,7 +103,7 @@ Model2_wipeSettings(){
Model2_uninstall(){
setMSG "Uninstalling $Model2_emuName. Saves and ROMs will be retained in the ROMs folder."
find ${romsPath}/model2 -mindepth 1 -name roms -prune -o -exec rm -rf '{}' \; &>> /dev/null
rm -rf "$HOME/.local/share/applications/Model 2 (Proton).desktop"
rm -rf "$HOME/.local/share/applications/Model 2 Emulator (Proton).desktop"
Model2_wipeSettings
}

35
functions/ToolScripts/emuDeckESDE.sh
View file

@ -1,12 +1,13 @@
#!/bin/bash
#variables
ESDE_toolName="EmulationStation-DE"
ESDE_toolName="ES-DE"
ESDE_oldtoolName="EmulationStation-DE"
ESDE_downloadedToolName="EmulationStation-DE-x64_SteamDeck.AppImage"
ESDE_toolType="AppImage"
ESDE_oldConfigDirectory="$ESDE_newConfigDirectory"
ESDE_newConfigDirectory="$HOME/ES-DE"
ESDE_toolLocation="$HOME/Applications"
ESDE_toolPath="${ESDE_toolLocation}/EmulationStation-DE.AppImage"
ESDE_toolPath="${ESDE_toolLocation}/ES-DE.AppImage"
ESDE_releaseURL="https://gitlab.com/es-de/emulationstation-de/-/package_files/76389058/download" #default URl in case of issues parsing json
ESDE_releaseMD5="b749b927d61317fde0250af9492a4b9f" #default hash
ESDE_prereleaseURL=""
@ -15,7 +16,7 @@ ESDE_releaseJSON="https://gitlab.com/es-de/emulationstation-de/-/raw/master/late
ESDE_addSteamInputFile="$EMUDECKGIT/configs/steam-input/emulationstation-de_controller_config.vdf"
steam_input_templateFolder="$HOME/.steam/steam/controller_base/templates/"
es_systemsFile="$ESDE_newConfigDirectory/custom_systems/es_systems.xml"
es_settingsFile="$ESDE_newConfigDirectory/es_settings.xml"
es_settingsFile="$ESDE_newConfigDirectory/settings/es_settings.xml"
es_rulesFile="$ESDE_newConfigDirectory/custom_systems/es_find_rules.xml"
@ -42,32 +43,32 @@ ESDE_migration(){
if [ -f "${toolsPath}/$ESDE_downloadedToolName" ] && [ ! -L "${toolsPath}/$ESDE_downloadedToolName" ]; then
mv "${toolsPath}/$ESDE_downloadedToolName" "$ESDE_toolPath"
sed -i "s|$ESDE_downloadedToolName|$ESDE_toolName|g" "$ESDE_toolLocation/launchers/esde/emulationstationde.sh"
sed -i "s|$ESDE_downloadedToolName|$ESDE_toolName|g" "$ESDE_toolLocation/launchers/es-de/es-de.sh"
echo "$ESDE_toolName successfully migrated and linked."
fi
if [ -f "${toolsPath}/$ESDE_toolName.AppImage" ] && [ ! -L "${toolsPath}/$ESDE_toolName.AppImage" ]; then
if [ -f "${toolsPath}/$ESDE_oldtoolName.AppImage" ] && [ ! -L "${toolsPath}/$ESDE_oldtoolName.AppImage" ]; then
mv "${toolsPath}/$ESDE_toolName.AppImage" "$ESDE_toolPath"
ln -s "$ESDE_toolPath" "${toolsPath}/$ESDE_toolName.AppImage"
mv "${toolsPath}/$ESDE_oldtoolName.AppImage" "$ESDE_toolPath"
ln -s "$ESDE_toolPath" "${toolsPath}/$ESDE_oldtoolName.AppImage"
echo "$ESDE_toolName successfully migrated and linked."
fi
}
ESDE_createDesktopShortcut(){
ESDE_customDesktopShortcut(){
mkdir -p "$toolsPath/launchers/esde"
cp "$EMUDECKGIT/tools/launchers/esde/emulationstationde.sh" "$toolsPath/launchers/esde/emulationstationde.sh"
rm -rf $HOME/.local/share/applications/$ESDE_toolName.desktop
mkdir -p "$toolsPath/launchers/es-de"
cp "$EMUDECKGIT/tools/launchers/es-de/es-de.sh" "$toolsPath/launchers/es-de/es-de.sh"
rm -rf $HOME/.local/share/applications/$ESDE_oldtoolName.desktop
createDesktopShortcut "$HOME/.local/share/applications/$ESDE_toolName.desktop" \
"$ESDE_toolName AppImage" \
"${toolsPath}/launchers/esde/emulationstationde.sh" \
"false"
"$ESDE_toolName AppImage" \
"${toolsPath}/launchers/es-de/es-de.sh" \
"false"
}
ESDE_uninstall(){
rm -rf "${toolsPath}/$ESDE_toolName.AppImage"
rm -rf "${toolsPath}/$ESDE_oldtoolName.AppImage"
rm -rf "${toolsPath}/$ESDE_downloadedToolName"
rm -rf "$ESDE_toolPath"
rm -rf $HOME/.local/share/applications/$ESDE_toolName.desktop
@ -89,7 +90,7 @@ ESDE_install(){
if [[ $ESDE_releaseURL = "https://gitlab.com/es-de/emulationstation-de/-/package_files/"* ]]; then
if safeDownload "$ESDE_toolName" "$ESDE_releaseURL" "$ESDE_toolPath" "$showProgress"; then
chmod +x "$ESDE_toolPath"
ESDE_createDesktopShortcut
ESDE_customDesktopShortcut
else
return 1
fi
@ -110,7 +111,7 @@ ESDE_init(){
rsync -avhp --mkpath "$EMUDECKGIT/configs/emulationstation/es_settings.xml" "$(dirname "$es_settingsFile")" --backup --suffix=.bak
rsync -avhp --mkpath "$EMUDECKGIT/configs/emulationstation/custom_systems/es_systems.xml" "$(dirname "$es_systemsFile")" --backup --suffix=.bak
cp -r "$EMUDECKGIT/tools/launchers/esde/." "$toolsPath/launchers/esde/" && chmod +x "$toolsPath/launchers/esde/emulationstationde.sh"
cp -r "$EMUDECKGIT/tools/launchers/es-de/." "$toolsPath/launchers/es-de/" && chmod +x "$toolsPath/launchers/es-de/es-de.sh"
ESDE_addCustomSystems
ESDE_setEmulationFolder

25
functions/ToolScripts/emuDeckSRM.sh
View file

@ -12,7 +12,7 @@ SRM_install(){
local showProgress="$1"
if installToolAI "$SRM_toolName" "$(getReleaseURLGH "SteamGridDB/steam-rom-manager" "AppImage")" "" "$showProgress"; then
SRM_createDesktopShortcut
SRM_customDesktopShortcut
else
return 1
fi
@ -21,29 +21,32 @@ SRM_install(){
SRM_uninstall(){
rm -rf "${toolsPath}/Steam ROM Manager.AppImage"
rm -rf $HOME/.local/share/applications/SRM.desktop
rm -rf "$HOME/.local/share/applications/Steam ROM Manager.desktop"
}
SRM_createDesktopShortcut(){
SRM_customDesktopShortcut(){
mkdir -p "$toolsPath/launchers/srm"
cp "$EMUDECKGIT/tools/launchers/srm/steamrommanager.sh" "$toolsPath/launchers/srm/steamrommanager.sh"
rm -rf $HOME/.local/share/applications/SRM.desktop
createDesktopShortcut "$HOME/.local/share/applications/Steam ROM Manager.desktop" \
"Steam ROM Manager AppImage" \
"${toolsPath}/launchers/srm/steamrommanager.sh" \
"false"
"Steam-ROM-Manager AppImage" \
"${toolsPath}/launchers/srm/steamrommanager.sh" \
"false"
}
SRM_migration(){
if [ -f "${toolsPath}/srm/Steam-ROM-Manager.AppImage" ]; then
mv "${toolsPath}/srm/Steam-ROM-Manager.AppImage" "${toolsPath}/Steam ROM Manager.AppImage" &> /dev/null
SRM_createDesktopShortcut
SRM_customDesktopShortcut
SRM_createParsers
SRM_addSteamInputProfiles
SRM_createParsers
SRM_addSteamInputProfiles
Citra_resetConfig
PCSX2QT_resetConfig
DuckStation_resetConfig
Citra_resetConfig
PCSX2QT_resetConfig
DuckStation_resetConfig
fi
}

0
icons/EmulationStationDE.png → icons/ES-DE.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

0
icons/model2.png → icons/Model-2-Emulator.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 36 KiB

0
icons/SteamROMManager.png → icons/Steam-ROM-Manager.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

2
tools/launchers/esde/emulationstationde.sh → tools/launchers/es-de/es-de.sh
View file

@ -1,5 +1,5 @@
#!/bin/bash
source $HOME/.config/EmuDeck/backend/functions/all.sh
cloud_sync_downloadEmuAll && cloud_sync_startService
"$ESDE_toolLocation/EmulationStation-DE.AppImage" "${@}"
"$ESDE_toolPath" "${@}"
rm -rf "$savesPath/.gaming"

19
uninstall.sh
View file

@ -271,6 +271,7 @@ fi
if [[ "$doUninstallBigPEmu" == true ]]; then
rm -rf $HOME/Applications/BigPEmu &>> /dev/null
rm -rf $HOME/.local/share/applications/BigPEmu.desktop &>> /dev/null
rm -rf "$HOME/.local/share/applications/BigPEmu (Proton).desktop" &>> /dev/null
fi
if [[ "$doUninstallCemu" == true ]]; then
find ${romsPath}/wiiu -mindepth 1 -name roms -prune -o -exec rm -rf '{}' \;
@ -316,7 +317,10 @@ fi
fi
if [[ "$doUninstallModel2" == true ]]; then
find ${romsPath}/model2 -mindepth 1 -name roms -prune -o -exec rm -rf '{}' \; &>> /dev/null
# Leaving this here for Patreon users stuck with the old name.
rm -f "$HOME/.local/share/applications/Model 2 (Proton).desktop" &> /dev/null
# Current name.
rm -f "$HOME/.local/share/applications/Model 2 Emulator (Proton).desktop" &> /dev/null
fi
if [[ "$doUninstallPCSX2" == true ]]; then
rm -rf $HOME/Applications/pcsx2-Qt.AppImage &> /dev/null
@ -465,16 +469,19 @@ fi
rm -rf "$HOME/.local/share/applications/Steam ROM Manager.desktop" &> /dev/null
# EmulationStation-DE
rm -rf $HOME/.emulationstation
rm -rf "$HOME/.local/share/applications/Steam ROM Manager.desktop" &> /dev/null
rm -rf "$HOME/.local/share/applications/EmulationStation-DE.desktop" &> /dev/null
rm -rf "$toolsPath/EmulationStation-DE.AppImage"
rm -rf "$HOME/ES-DE" &> /dev/null
rm -rf "$toolsPath/EmulationStation-DE.AppImage" &> /dev/null
rm -rf $HOME/Applications/EmulationStation-DE.AppImage &> /dev/null
# Not sure what to do with this. ULWGL will become a dependency for Heroic and Lutris soon, will leave this commented out for now and add smarter detection later.
# rm -rf "$HOME/.local/share/ULWGL"
rm -rf $HOME/Applications/ES-DE.AppImage &> /dev/null
rm -rf "$HOME/.local/share/applications/EmulationStation-DE.desktop" &> /dev/null
rm -rf "$HOME/.local/share/applications/ES-DE.desktop" &> /dev/null
# ULWGL
rm -rf "$HOME/.local/share/ULWGL" &> /dev/null
# SteamDeckGyroDSU
rm -rf "$HOME/sdgyrodsu" &> /dev/null
# Pegasus
flatpak uninstall org.pegasus_frontend.Pegasus -y
rm -rf "$HOME/.var/app/org.pegasus_frontend.Pegasus/" &> /dev/null
rm -rf "$HOME/.local/share/applications/Pegasus.desktop" &> /dev/null
echo "90"
echo "# Removing EmuDeck folders";