Emulation/EmuDeck
1
0
Fork 0
mirror of https://github.com/dragoonDorise/EmuDeck.git synced 2024-06-02 19:47:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into dev

Browse source
This commit is contained in:
Dragoon Dorise 2024-03-22 13:10:08 +01:00
parent ef5cd04818 b95c23456d
commit 373009f339
4 changed files with 5 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
functions/ToolScripts/emuDeckSRM.sh
View file

@ -41,12 +41,8 @@ SRM_migration(){
mv "${toolsPath}/srm/Steam-ROM-Manager.AppImage" "${toolsPath}/Steam ROM Manager.AppImage" &> /dev/null mv "${toolsPath}/srm/Steam-ROM-Manager.AppImage" "${toolsPath}/Steam ROM Manager.AppImage" &> /dev/null
SRM_customDesktopShortcut SRM_customDesktopShortcut
SRM_flushToolLauncher
SRM_init
Citra_resetConfig
PCSX2QT_resetConfig
DuckStation_resetConfig
fi fi
} }

5
functions/appImageInit.sh
View file

@ -17,11 +17,6 @@ appImageInit() {
autofix_duplicateESDE autofix_duplicateESDE
autofix_lnk autofix_lnk
SRM_migration # 2.2 Changes SRM_migration # 2.2 Changes
ESDE_migration # 2.2 Changes
autofix_dynamicParsers # 2.2 Changes
#Force SRM appimage move in case the migration fails
mv "${toolsPath}/srm/Steam-ROM-Manager.AppImage" "${toolsPath}/Steam ROM Manager.AppImage" &> /dev/null
if [ -d "$HOME/.config/pegasus-frontend/config" ]; then if [ -d "$HOME/.config/pegasus-frontend/config" ]; then
rsync -avz $HOME/.config/pegasus-frontend/config/ $HOME/.config/pegasus-frontend/ rsync -avz $HOME/.config/pegasus-frontend/config/ $HOME/.config/pegasus-frontend/

7
functions/checkBIOS.sh
View file

@ -66,9 +66,10 @@ checkPS2BIOS(){
} }
checkYuzuBios(){ checkYuzuBios(){
FILE="$HOME/.local/share/yuzu/keys/prod.keys" RYUJINXFIRMWARE="$HOME/.config/Ryujinx/bis/system/Contents/registered"
if [ -f "$FILE" ]; then RYUJINXKEYS="$HOME/.config/Ryujinx/system/prod.keys"
if [[ -f "$RYUJINXKEYS" ]] && [[ "$( ls -A "$RYUJINXFIRMWARE")" ]]; then
echo "true"; echo "true";
else else
echo "false"; echo "false";

32
setup.sh
View file

@ -477,38 +477,6 @@ fi
## ##
# #
if [ "$system" != "darwin" ]; then
#If the user is not using chimera we assume he has no pass ( deck user )
if [ "$system" = "chimeraos" ]; then
password="gamer"
else
password="Decky!"
fi
#We try to create a temp password
pwstatus=0
yes "$password" | passwd $(whoami) && echo "$password" | sudo -v -S &>/dev/null && pwstatus=1 || echo "Password already set, we do nothing..." #refresh sudo cache
# We install everything in case we've succesfully created a password
if [ $pwstatus = 1 ]; then
if ( echo "$password" | sudo -S -k true ); then
echo $password | sudo -v -S && {
Plugins_installEmuDecky $password
if [ "$system" == "chimeraos" ]; then
Plugins_installPowerControl $password
else
Plugins_installPowerTools $password
fi
Plugins_installPluginLoader $password
}
fi
if [ $password = "Decky!" ]; then
Plugins_install_cleanup "Decky!"
fi
fi
fi
#GyroDSU #GyroDSU
#Plugins_installSteamDeckGyroDSU #Plugins_installSteamDeckGyroDSU