mirror of
https://github.com/dragoonDorise/EmuDeck.git
synced 2024-05-10 00:44:06 -04:00
Handle special chars when echoing password for sudo req funcs? (#901)
* adds updating the roms path in usersettings to the migration * Fix migration with saves * Hotfix dolphin config Remove WirelessMac * SRM: update saturn parser to include saturnjp * freeze PCSX2 # Conflicts: # functions/EmuScripts/emuDeckPCSX2QT.sh * Update emuDeckPCSX2QT.sh * Add GitHub Issue Templates * Create pull_request_template.md * Update README.md * Update README.md * helpers: Fix FlatPak installed check (#875) The previous way of checking whether a package was installed or not was incorrect in its assumption, that a package ID will only occur once in the flatpak installed list. I noticed this while trying to install PPSSPP, as FlatPak installs a `org.ppsspp.PPSSPP` and `org.ppsspp.PPSSPP.Locale` package. The package was installed correctly, but EmuDeck would register it as non-installed. Signed-off-by: Sophie 'Tyalie' Friedrich <dev@flowerpot.me> * SDL Driver * hotfix Vita3k releaseURL hotfix Vita3k releaseURL * Update Vita3K's default config path (#890) * better linux support * Chimera * chimera * chimera * chimeraaa * chimeraPath * chimeraos FIX * chimera fixes * fixed readme # Conflicts: # README.md # Conflicts: # README.md * Handle special chars when echoing password for sudo req funcs * store zenity/cli prompt passwd as str --------- Signed-off-by: Sophie 'Tyalie' Friedrich <dev@flowerpot.me> Co-authored-by: Livedeht <godsbane@gmail.com> Co-authored-by: Rodrigo <rodrigosedano@me.com> Co-authored-by: 108900299+rawdatafeel@users.noreply.github.com <108900299+rawdatafeel@users.noreply.github.com> Co-authored-by: Sophie Tyalie <dev@flowerpot.me> Co-authored-by: Pedro Montes Alcalde <pedro.montes.alcalde@gmail.com>
This commit is contained in:
parent
ebd564a9eb
commit
38fcd2738b
|
@ -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
|
||||
VSync = True
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -140,4 +140,4 @@ Vita3K_resetConfig(){
|
|||
|
||||
Vita3K_setResolution(){
|
||||
echo "NYI"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)"
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
2
setup.sh
2
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
|
||||
|
|
Loading…
Reference in a new issue