diff --git a/configs/org.DolphinEmu.dolphin-emu/config/dolphin-emu/Dolphin.ini b/configs/org.DolphinEmu.dolphin-emu/config/dolphin-emu/Dolphin.ini index 837c7566..f10ddd8e 100644 --- a/configs/org.DolphinEmu.dolphin-emu/config/dolphin-emu/Dolphin.ini +++ b/configs/org.DolphinEmu.dolphin-emu/config/dolphin-emu/Dolphin.ini @@ -39,7 +39,6 @@ ISOPath0 = /run/media/mmcblk0p1/Emulation/roms/gamecube ISOPaths = 2 ISOPath1 = /run/media/mmcblk0p1/Emulation/roms/wii UseGameCovers = False -WirelessMac = 00:17:ab:a9:b9:91 [Interface] ConfirmStop = False OnScreenDisplayMessages = True @@ -51,4 +50,4 @@ LanguageCode = en ThemeName = Clean CursorVisibility = 0 [Hardware] -VSync = True \ No newline at end of file +VSync = True diff --git a/functions/EmuScripts/emuDeckRetroArch.sh b/functions/EmuScripts/emuDeckRetroArch.sh index 736a3848..d1d20a5c 100644 --- a/functions/EmuScripts/emuDeckRetroArch.sh +++ b/functions/EmuScripts/emuDeckRetroArch.sh @@ -181,9 +181,11 @@ RetroArch_update(){ RetroArch_installCores RetroArch_setUpCoreOptAll RetroArch_setConfigAll + RetroArch_setupConfigurations } + #ConfigurePaths RetroArch_setEmulationFolder(){ @@ -2209,7 +2211,6 @@ RetroArch_retroAchievementsSetLogin(){ fi } - RetroArch_setBezels(){ if [ "$RABezels" == true ]; then RetroArch_bezelOnAll diff --git a/functions/EmuScripts/emuDeckVita3K.sh b/functions/EmuScripts/emuDeckVita3K.sh index 9a982645..4d552e84 100644 --- a/functions/EmuScripts/emuDeckVita3K.sh +++ b/functions/EmuScripts/emuDeckVita3K.sh @@ -140,4 +140,4 @@ Vita3K_resetConfig(){ Vita3K_setResolution(){ echo "NYI" -} \ No newline at end of file +} diff --git a/functions/ToolScripts/emuDeckCloudSync.sh b/functions/ToolScripts/emuDeckCloudSync.sh index ba21a682..1a9c9553 100644 --- a/functions/ToolScripts/emuDeckCloudSync.sh +++ b/functions/ToolScripts/emuDeckCloudSync.sh @@ -19,7 +19,7 @@ cloud_sync_install(){ text="$(printf "We need to install our Decky Plugin so you can use CloudSync on Gaming Mode.\nPlease enter your sudo/admin password so we can install it.")" - PASS=$(zenity --title="Decky CloudSync Plugin Installer" --width=300 --height=100 --entry --hide-text --text="${text}") + read -r PASS <<< $(zenity --title="Decky CloudSync Plugin Installer" --width=300 --height=100 --entry --hide-text --text="${text}") if [[ $? -eq 1 ]] || [[ $? -eq 5 ]]; then exit 1 fi diff --git a/functions/ToolScripts/emuDeckESDE.sh b/functions/ToolScripts/emuDeckESDE.sh index f0334c06..ef4f721c 100644 --- a/functions/ToolScripts/emuDeckESDE.sh +++ b/functions/ToolScripts/emuDeckESDE.sh @@ -13,6 +13,8 @@ steam_input_templateFolder="$HOME/.steam/steam/controller_base/templates/" es_systemsFile="$HOME/.emulationstation/custom_systems/es_systems.xml" es_rulesFile="$HOME/.emulationstation/custom_systems/es_find_rules.xml" es_settingsFile="$HOME/.emulationstation/es_settings.xml" +es_rulesFile="$HOME/.emulationstation/custom_systems/es_find_rules.xml" + ESDE_SetAppImageURLS() { local json="$(curl -s $ESDE_releaseJSON)" diff --git a/functions/ToolScripts/emuDeckPlugins.sh b/functions/ToolScripts/emuDeckPlugins.sh index 7edbbff6..75a318bc 100644 --- a/functions/ToolScripts/emuDeckPlugins.sh +++ b/functions/ToolScripts/emuDeckPlugins.sh @@ -25,7 +25,7 @@ Plugins_checkPassword(){ if ( echo "$PASS" | sudo -S -k true ); then echo "true" else - PASS=$(zenity --title="Decky Installer" --width=300 --height=100 --entry --hide-text --text="Enter your sudo/admin password so we can install Decky with the best plugins for emulation") + read -r PASS <<< $(zenity --title="Decky Installer" --width=300 --height=100 --entry --hide-text --text="Enter your sudo/admin password so we can install Decky with the best plugins for emulation") if [[ $? -eq 1 ]] || [[ $? -eq 5 ]]; then exit 1 fi diff --git a/install-darwin.sh b/install-darwin.sh index c6672e01..02d383c5 100644 --- a/install-darwin.sh +++ b/install-darwin.sh @@ -75,7 +75,7 @@ EOT } if [ $hasBrew == "false" ]; then - pass="$(prompt 'EmuDeck needs to install Brew, and for that you need to input your password:' '')" + read -r pass <<< "$(prompt 'EmuDeck needs to install Brew, and for that you need to input your password:' '')" echo $pass | sudo -v -S && { NONINTERACTIVE=1 /bin/bash -c "$(curl -fsSLk https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" } diff --git a/install.sh b/install.sh index 8650c97e..524aec7e 100644 --- a/install.sh +++ b/install.sh @@ -12,12 +12,12 @@ elif [ $linuxID != "SteamOS" ]; then zenityAvailable=$(command -v zenity &> /dev/null && echo true) if [[ $zenityAvailable = true ]];then - PASSWD="$(zenity --password --title="Password Entry" --text="Enter you user sudo password to install required depencies" 2>/dev/null)" + read -r PASSWD <<< "$(zenity --password --title="Password Entry" --text="Enter you user sudo password to install required depencies" 2>/dev/null)" echo "$PASSWD" | sudo -v -S ans=$? if [[ $ans == 1 ]]; then #incorrect password - PASSWD="$(zenity --password --title="Password Entry" --text="Password was incorrect. Try again. (Did you remember to set a password for linux before running this?)" 2>/dev/null)" + read -r PASSWD <<< "$(zenity --password --title="Password Entry" --text="Password was incorrect. Try again. (Did you remember to set a password for linux before running this?)" 2>/dev/null)" echo "$PASSWD" | sudo -v -S ans=$? if [[ $ans == 1 ]]; then diff --git a/setup.sh b/setup.sh index 215a838a..c66f3fc8 100644 --- a/setup.sh +++ b/setup.sh @@ -453,7 +453,7 @@ if [ "$system" != "darwin" ]; then yes "$password" | passwd $(whoami) && "$password" | sudo -v -S &>/dev/null && pwstatus=1 || echo "sudo password was incorrect" #refresh sudo cache # We can't create the pass?we ask for it if [ $pwstatus = 0 ]; then - password=$(Plugins_checkPassword "newPass") + read -r password <<< $(Plugins_checkPassword "newPass") fi if ( echo "$password" | sudo -S -k true ); then