From ccbe279eb0f3b596d81c1f149cf4e755b104e34d Mon Sep 17 00:00:00 2001 From: Dragoon Dorise Date: Sun, 29 Dec 2024 19:37:08 +0100 Subject: [PATCH 01/13] & --- install-early.sh | 2 +- install-unstable.sh | 2 +- install.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/install-early.sh b/install-early.sh index a5632e0f0..58b6b9437 100644 --- a/install-early.sh +++ b/install-early.sh @@ -109,5 +109,5 @@ EMUDECK_URL="$(curl -s ${EMUDECK_GITHUB_URL} | grep -E 'browser_download_url.*Ap mkdir -p ~/Applications curl -L "${EMUDECK_URL}" -o ~/Applications/EmuDeck.AppImage 2>&1 | stdbuf -oL tr '\r' '\n' | sed -u 's/^ *\([0-9][0-9]*\).*\( [0-9].*$\)/\1\n#Download Speed\:\2/' | zenity --progress --title "Downloading EmuDeck" --width 600 --auto-close --no-cancel 2>/dev/null chmod +x ~/Applications/EmuDeck.AppImage -~/Applications/EmuDeck.AppImage $sandbox +~/Applications/EmuDeck.AppImage $sandbox & exit diff --git a/install-unstable.sh b/install-unstable.sh index 21ee999ab..26542bc51 100644 --- a/install-unstable.sh +++ b/install-unstable.sh @@ -109,5 +109,5 @@ EMUDECK_URL="$(curl -s ${EMUDECK_GITHUB_URL} | grep -E 'browser_download_url.*Ap mkdir -p ~/Applications curl -L "${EMUDECK_URL}" -o ~/Applications/EmuDeck.AppImage 2>&1 | stdbuf -oL tr '\r' '\n' | sed -u 's/^ *\([0-9][0-9]*\).*\( [0-9].*$\)/\1\n#Download Speed\:\2/' | zenity --progress --title "Downloading EmuDeck" --width 600 --auto-close --no-cancel 2>/dev/null chmod +x ~/Applications/EmuDeck.AppImage -~/Applications/EmuDeck.AppImage $sandbox +~/Applications/EmuDeck.AppImage $sandbox & exit diff --git a/install.sh b/install.sh index d5d3b6635..670ad6ab0 100644 --- a/install.sh +++ b/install.sh @@ -109,5 +109,5 @@ EMUDECK_URL="$(curl -s ${EMUDECK_GITHUB_URL} | grep -E 'browser_download_url.*Ap mkdir -p ~/Applications curl -L "${EMUDECK_URL}" -o ~/Applications/EmuDeck.AppImage 2>&1 | stdbuf -oL tr '\r' '\n' | sed -u 's/^ *\([0-9][0-9]*\).*\( [0-9].*$\)/\1\n#Download Speed\:\2/' | zenity --progress --title "Downloading EmuDeck" --width 600 --auto-close --no-cancel 2>/dev/null chmod +x ~/Applications/EmuDeck.AppImage -~/Applications/EmuDeck.AppImage $sandbox +~/Applications/EmuDeck.AppImage $sandbox & exit From 3391c61b507967b599fbe34b90232b305a33387d Mon Sep 17 00:00:00 2001 From: Dragoon Dorise Date: Sun, 29 Dec 2024 20:01:09 +0100 Subject: [PATCH 02/13] timed setup --- setup.sh | 160 +++++++++++++++++++++++++++---------------------------- 1 file changed, 78 insertions(+), 82 deletions(-) diff --git a/setup.sh b/setup.sh index f27d5c8db..a38e56a15 100644 --- a/setup.sh +++ b/setup.sh @@ -99,7 +99,7 @@ SECONDTIME="$HOME/.config/EmuDeck/.finished" #Lets log github API limits just in case echo 'Github API limits:' -curl -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" "https://api.github.com/rate_limit" +time curl -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" "https://api.github.com/rate_limit" # ## @@ -119,7 +119,7 @@ EMUDECKGIT="$HOME/.config/EmuDeck/backend" source "$EMUDECKGIT"/functions/helperFunctions.sh source "$EMUDECKGIT"/functions/jsonToBashVars.sh -jsonToBashVars "$HOME/.config/EmuDeck/settings.json" +time jsonToBashVars "$HOME/.config/EmuDeck/settings.json" source "$EMUDECKGIT/functions/all.sh" @@ -137,8 +137,8 @@ grep -vi pass "$emuDecksettingsFile" # echo "" echo "Env Details: " -getEnvironmentDetails -testRealDeck +time getEnvironmentDetails +time testRealDeck #this sets up the settings file with defaults, in case they don't have a new setting we've added. #also echos them all out so they are in the log. @@ -146,7 +146,7 @@ testRealDeck #createUpdateSettingsFile #create folders after tests! -createFolders +time createFolders #setup Proton-Launch.sh #because this path gets updated by sed, we really should be installing it every time and allowing it to be updated every time. In case the user changes their path. @@ -161,152 +161,152 @@ chmod +x "${toolsPath}/emu-launch.sh" #ESDE Installation if [ $doInstallESDE == "true" ]; then echo "install esde" - ESDE_install + time ESDE_install fi #Pegasus Installation if [ $doInstallPegasus == "true" ]; then echo "install Pegasus" - pegasus_install + time pegasus_install fi #SRM Installation if [ $doInstallSRM == "true" ]; then echo "install srm" - SRM_install + time SRM_install fi if [ "$doInstallPCSX2QT" == "true" ]; then echo "install pcsx2Qt" - PCSX2QT_install + time PCSX2QT_install fi if [ $doInstallPrimeHack == "true" ]; then echo "install primehack" - Primehack_install + time Primehack_install fi if [ $doInstallRPCS3 == "true" ]; then echo "install rpcs3" - RPCS3_install + time RPCS3_install fi if [ $doInstallCitra == "true" ]; then echo "install Citra" - Citra_install + time Citra_install fi if [ $doInstallLime3DS == "true" ]; then echo "install Lime3DS" - Lime3DS_install + time Lime3DS_install fi if [ $doInstallDolphin == "true" ]; then echo "install Dolphin" - Dolphin_install + time Dolphin_install fi if [ $doInstallDuck == "true" ]; then echo "DuckStation_install" - DuckStation_install + time DuckStation_install fi if [ $doInstallRA == "true" ]; then echo "RetroArch_install" - RetroArch_install + time RetroArch_install fi if [ $doInstallRMG == "true" ]; then echo "RMG_install" - RMG_install + time RMG_install fi if [ $doInstallares == "true" ]; then echo "ares_install" - ares_install + time ares_install fi if [ $doInstallPPSSPP == "true" ]; then echo "PPSSPP_install" - PPSSPP_install + time PPSSPP_install fi if [ $doInstallYuzu == "true" ]; then echo "Yuzu_install" - Yuzu_install + time Yuzu_install fi if [ $doInstallSuyu == "true" ]; then echo "suyu_install" - suyu_install + time suyu_install fi if [ $doInstallRyujinx == "true" ]; then echo "Ryujinx_install" - Ryujinx_install + time Ryujinx_install fi if [ $doInstallMAME == "true" ]; then echo "MAME_install" - MAME_install + time MAME_install fi if [ $doInstallXemu == "true" ]; then echo "Xemu_install" - Xemu_install + time Xemu_install fi if [ $doInstallCemu == "true" ]; then echo "Cemu_install" - Cemu_install + time Cemu_install fi if [ "${doInstallCemuNative}" == "true" ]; then echo "CemuNative_install" - CemuNative_install + time CemuNative_install fi if [ $doInstallScummVM == "true" ]; then echo "ScummVM_install" - ScummVM_install + time ScummVM_install fi if [ $doInstallVita3K == "true" ]; then echo "Vita3K_install" - Vita3K_install + time Vita3K_install fi if [ $doInstallMGBA == "true" ]; then echo "mGBA_install" - mGBA_install + time mGBA_install fi if [ $doInstallFlycast == "true" ]; then echo "Flycast_install" - Flycast_install + time Flycast_install fi if [ $doInstallRMG == "true" ]; then echo "RMG_install" - RMG_install + time RMG_install fi if [ $doInstallares == "true" ]; then echo "ares_install" - ares_install + time ares_install fi if [ $doInstallmelonDS == "true" ]; then echo "melonDS_install" - melonDS_install + time melonDS_install fi if [ $doInstallBigPEmu == "true" ]; then echo "BigPEmu_install" - BigPEmu_install + time BigPEmu_install fi if [ $doInstallSupermodel == "true" ]; then echo "Supermodel_install" - Supermodel_install + time Supermodel_install fi #Xenia - We need to install Xenia after creating the Roms folders! if [ "$doInstallXenia" == "true" ]; then echo "Xenia_install" - Xenia_install + time Xenia_install fi if [ "$doInstallModel2" == "true" ]; then echo "Model2_install" - Model2_install + time Model2_install fi if [ "$doInstallShadPS4" == "true" ]; then echo "ShadPS4_install" - ShadPS4_install + time ShadPS4_install fi #Steam RomManager Config if [ "$doSetupSRM" == "true" ]; then echo "SRM_init" - SRM_init + time SRM_init fi #ESDE Config if [ "$doSetupESDE" == "true" ]; then echo "ESDE_init" - ESDE_update + time ESDE_update fi #Pegasus Config @@ -323,116 +323,112 @@ setMSG "Configuring emulators.." if [ "$doSetupRA" == "true" ]; then echo "RetroArch_init" - RetroArch_init + time RetroArch_init fi if [ "$doSetupPrimehack" == "true" ]; then echo "Primehack_init" - Primehack_init + time Primehack_init fi if [ "$doSetupDolphin" == "true" ]; then echo "Dolphin_init" - Dolphin_init + time Dolphin_init fi if [ "$doSetupPCSX2QT" == "true" ]; then echo "PCSX2QT_init" - PCSX2QT_init + time PCSX2QT_init fi if [ "$doSetupRPCS3" == "true" ]; then echo "RPCS3_init" - RPCS3_init + time RPCS3_init fi if [ "$doSetupCitra" == "true" ]; then echo "Citra_init" - Citra_init + time Citra_init fi if [ $doSetupLime3DS == "true" ]; then echo "Lime3DS_init" - Lime3DS_init + time Lime3DS_init fi if [ "$doSetupDuck" == "true" ]; then echo "DuckStation_init" - DuckStation_init + time DuckStation_init fi if [ "$doSetupYuzu" == "true" ]; then echo "Yuzu_init" - Yuzu_init -fi -if [ "$doSetupSuyu" == "true" ]; then - echo "suzu_init" - suzu_init + time Yuzu_init fi if [ "$doSetupRyujinx" == "true" ]; then echo "Ryujinx_init" - Ryujinx_init + time Ryujinx_init fi if [ "$doSetupShadPS4" == "true" ]; then echo "ShadPS4_init" - ShadPS4_init + time ShadPS4_init fi if [ "$doSetupPPSSPP" == "true" ]; then echo "PPSSPP_init" - PPSSPP_init + time PPSSPP_init fi if [ "$doSetupXemu" == "true" ]; then echo "Xemu_init" - Xemu_init + time Xemu_init fi if [ "$doSetupMAME" == "true" ]; then echo "MAME_init" - MAME_init + time MAME_init fi if [ "$doSetupScummVM" == "true" ]; then echo "ScummVM_init" - ScummVM_init + time ScummVM_init fi if [ "$doSetupVita3K" == "true" ]; then echo "Vita3K_init" - Vita3K_init + time Vita3K_init fi if [ "$doSetupRMG" == "true" ]; then echo "RMG_init" - RMG_init + time RMG_init fi if [ "$doSetupares" == "true" ]; then echo "ares_init" - ares_init + time ares_init fi if [ "$doSetupmelonDS" == "true" ]; then echo "melonDS_init" - melonDS_init + time melonDS_init fi if [ "$doSetupMGBA" == "true" ]; then echo "mGBA_init" - mGBA_init + time mGBA_init fi if [ "${doSetupCemuNative}" == "true" ]; then echo "CemuNative_init" - CemuNative_init + time CemuNative_init fi if [ "$doSetupFlycast" == "true" ]; then echo "Flycast_init" - Flycast_init + time Flycast_init fi if [ "$doSetupSupermodel" == "true" ]; then echo "Supermodel_init" - Supermodel_init + time Supermodel_init fi if [ "$doSetupModel2" == "true" ]; then echo "model2_init" - Model2_init + time Model2_init fi #Proton Emus if [ "$doSetupCemu" == "true" ]; then echo "Cemu_init" - Cemu_init + time Cemu_init fi if [ "$doSetupBigPEmu" == "true" ]; then echo "BigPEmu_init" - BigPEmu_init + time BigPEmu_init fi if [ "$doSetupXenia" == "true" ]; then echo "Xenia_init" - Xenia_init + time Xenia_init fi @@ -444,11 +440,11 @@ fi #Always install -BINUP_install -AutoCopy_install -server_install -FlatpakUP_install -CHD_install +time BINUP_install +time AutoCopy_install +time server_install +time FlatpakUP_install +time CHD_install # ## @@ -462,12 +458,12 @@ CHD_install # if [ "$doSetupRA" == "true" ]; then if [ "$(getScreenAR)" == 169 ];then - nonDeck_169Screen + time nonDeck_169Screen fi #Anbernic Win600 Special configuration if [ "$(getProductName)" == "Win600" ];then - nonDeck_win600 + time nonDeck_win600 fi fi @@ -487,13 +483,13 @@ if [ "$system" == "chimeraos" ]; then fi -createDesktopIcons +time createDesktopIcons if [ "$controllerLayout" == "bayx" ] || [ "$controllerLayout" == "baxy" ] ; then - controllerLayout_BAYX + time controllerLayout_BAYX else - controllerLayout_ABXY + time controllerLayout_ABXY fi # @@ -529,7 +525,7 @@ rm "$PIDFILE" ## We check all the selected emulators are installed # -checkInstalledEmus +time checkInstalledEmus # From e32d4f54cb6de287a9985f7a8f995da3400112c0 Mon Sep 17 00:00:00 2001 From: Dragoon Dorise Date: Sun, 29 Dec 2024 20:04:09 +0100 Subject: [PATCH 03/13] test --- install.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/install.sh b/install.sh index 670ad6ab0..5b8b64087 100644 --- a/install.sh +++ b/install.sh @@ -110,4 +110,3 @@ mkdir -p ~/Applications curl -L "${EMUDECK_URL}" -o ~/Applications/EmuDeck.AppImage 2>&1 | stdbuf -oL tr '\r' '\n' | sed -u 's/^ *\([0-9][0-9]*\).*\( [0-9].*$\)/\1\n#Download Speed\:\2/' | zenity --progress --title "Downloading EmuDeck" --width 600 --auto-close --no-cancel 2>/dev/null chmod +x ~/Applications/EmuDeck.AppImage ~/Applications/EmuDeck.AppImage $sandbox & -exit From f0439ba76e98436efee4046d2b62be70c659f477 Mon Sep 17 00:00:00 2001 From: Dragoon Dorise Date: Sun, 29 Dec 2024 20:06:00 +0100 Subject: [PATCH 04/13] nohup --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 5b8b64087..e44e301b1 100644 --- a/install.sh +++ b/install.sh @@ -109,4 +109,4 @@ EMUDECK_URL="$(curl -s ${EMUDECK_GITHUB_URL} | grep -E 'browser_download_url.*Ap mkdir -p ~/Applications curl -L "${EMUDECK_URL}" -o ~/Applications/EmuDeck.AppImage 2>&1 | stdbuf -oL tr '\r' '\n' | sed -u 's/^ *\([0-9][0-9]*\).*\( [0-9].*$\)/\1\n#Download Speed\:\2/' | zenity --progress --title "Downloading EmuDeck" --width 600 --auto-close --no-cancel 2>/dev/null chmod +x ~/Applications/EmuDeck.AppImage -~/Applications/EmuDeck.AppImage $sandbox & +nohup ~/Applications/EmuDeck.AppImage $sandbox & From 02ec122de1eacf2264e64a568cdd523b75a5a870 Mon Sep 17 00:00:00 2001 From: Dragoon Dorise Date: Sun, 29 Dec 2024 20:07:23 +0100 Subject: [PATCH 05/13] test --- install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install.sh b/install.sh index e44e301b1..e7cd8d1f3 100644 --- a/install.sh +++ b/install.sh @@ -110,3 +110,4 @@ mkdir -p ~/Applications curl -L "${EMUDECK_URL}" -o ~/Applications/EmuDeck.AppImage 2>&1 | stdbuf -oL tr '\r' '\n' | sed -u 's/^ *\([0-9][0-9]*\).*\( [0-9].*$\)/\1\n#Download Speed\:\2/' | zenity --progress --title "Downloading EmuDeck" --width 600 --auto-close --no-cancel 2>/dev/null chmod +x ~/Applications/EmuDeck.AppImage nohup ~/Applications/EmuDeck.AppImage $sandbox & +sleep 10 \ No newline at end of file From 8bdae431d48628e5be5b368abe7bbbd402eae6c4 Mon Sep 17 00:00:00 2001 From: Dragoon Dorise Date: Sun, 29 Dec 2024 20:09:12 +0100 Subject: [PATCH 06/13] test --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index e7cd8d1f3..f46fa4b93 100644 --- a/install.sh +++ b/install.sh @@ -109,5 +109,5 @@ EMUDECK_URL="$(curl -s ${EMUDECK_GITHUB_URL} | grep -E 'browser_download_url.*Ap mkdir -p ~/Applications curl -L "${EMUDECK_URL}" -o ~/Applications/EmuDeck.AppImage 2>&1 | stdbuf -oL tr '\r' '\n' | sed -u 's/^ *\([0-9][0-9]*\).*\( [0-9].*$\)/\1\n#Download Speed\:\2/' | zenity --progress --title "Downloading EmuDeck" --width 600 --auto-close --no-cancel 2>/dev/null chmod +x ~/Applications/EmuDeck.AppImage -nohup ~/Applications/EmuDeck.AppImage $sandbox & +nohup ~/Applications/EmuDeck.AppImage $sandbox > /dev/null 2>&1 & sleep 10 \ No newline at end of file From 8aba971d1b8e5cb7c6e5721c0161aaceac3c08c5 Mon Sep 17 00:00:00 2001 From: Dragoon Dorise Date: Sun, 29 Dec 2024 20:12:12 +0100 Subject: [PATCH 07/13] test --- install.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install.sh b/install.sh index f46fa4b93..5179e71c4 100644 --- a/install.sh +++ b/install.sh @@ -109,5 +109,4 @@ EMUDECK_URL="$(curl -s ${EMUDECK_GITHUB_URL} | grep -E 'browser_download_url.*Ap mkdir -p ~/Applications curl -L "${EMUDECK_URL}" -o ~/Applications/EmuDeck.AppImage 2>&1 | stdbuf -oL tr '\r' '\n' | sed -u 's/^ *\([0-9][0-9]*\).*\( [0-9].*$\)/\1\n#Download Speed\:\2/' | zenity --progress --title "Downloading EmuDeck" --width 600 --auto-close --no-cancel 2>/dev/null chmod +x ~/Applications/EmuDeck.AppImage -nohup ~/Applications/EmuDeck.AppImage $sandbox > /dev/null 2>&1 & -sleep 10 \ No newline at end of file +~/Applications/EmuDeck.AppImage $sandbox > /dev/null 2>&1 & disown \ No newline at end of file From 7c8e7d9e00898bfbbf9ce72875449d242caddaaf Mon Sep 17 00:00:00 2001 From: Dragoon Dorise Date: Sun, 29 Dec 2024 20:14:01 +0100 Subject: [PATCH 08/13] test --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 5179e71c4..274a54496 100644 --- a/install.sh +++ b/install.sh @@ -109,4 +109,4 @@ EMUDECK_URL="$(curl -s ${EMUDECK_GITHUB_URL} | grep -E 'browser_download_url.*Ap mkdir -p ~/Applications curl -L "${EMUDECK_URL}" -o ~/Applications/EmuDeck.AppImage 2>&1 | stdbuf -oL tr '\r' '\n' | sed -u 's/^ *\([0-9][0-9]*\).*\( [0-9].*$\)/\1\n#Download Speed\:\2/' | zenity --progress --title "Downloading EmuDeck" --width 600 --auto-close --no-cancel 2>/dev/null chmod +x ~/Applications/EmuDeck.AppImage -~/Applications/EmuDeck.AppImage $sandbox > /dev/null 2>&1 & disown \ No newline at end of file +setsid ~/Applications/EmuDeck.AppImage $sandbox & \ No newline at end of file From 827724ddc233f922a61a3c8fdc9f7493d5f26407 Mon Sep 17 00:00:00 2001 From: Dragoon Dorise Date: Sun, 29 Dec 2024 20:15:12 +0100 Subject: [PATCH 09/13] test --- install.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 274a54496..1cf7d4a8d 100644 --- a/install.sh +++ b/install.sh @@ -6,9 +6,9 @@ sandbox="" if [ $linuxID = "Ubuntu" ]; then sandbox="--no-sandbox" fi - +clear if [ "$linuxID" == "SteamOS" ]; then - echo "installing EmuDeck" + echo "Installing EmuDeck" else zenityAvailable=$(command -v zenity &> /dev/null && echo true) @@ -109,4 +109,5 @@ EMUDECK_URL="$(curl -s ${EMUDECK_GITHUB_URL} | grep -E 'browser_download_url.*Ap mkdir -p ~/Applications curl -L "${EMUDECK_URL}" -o ~/Applications/EmuDeck.AppImage 2>&1 | stdbuf -oL tr '\r' '\n' | sed -u 's/^ *\([0-9][0-9]*\).*\( [0-9].*$\)/\1\n#Download Speed\:\2/' | zenity --progress --title "Downloading EmuDeck" --width 600 --auto-close --no-cancel 2>/dev/null chmod +x ~/Applications/EmuDeck.AppImage +echo "setsid" setsid ~/Applications/EmuDeck.AppImage $sandbox & \ No newline at end of file From 224aaf5bb36be522d5ba1e63154c1a3c7c5a94ba Mon Sep 17 00:00:00 2001 From: Dragoon Dorise Date: Sun, 29 Dec 2024 20:17:00 +0100 Subject: [PATCH 10/13] back to normal --- install-early.sh | 2 +- install-unstable.sh | 2 +- install.sh | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/install-early.sh b/install-early.sh index 58b6b9437..a5632e0f0 100644 --- a/install-early.sh +++ b/install-early.sh @@ -109,5 +109,5 @@ EMUDECK_URL="$(curl -s ${EMUDECK_GITHUB_URL} | grep -E 'browser_download_url.*Ap mkdir -p ~/Applications curl -L "${EMUDECK_URL}" -o ~/Applications/EmuDeck.AppImage 2>&1 | stdbuf -oL tr '\r' '\n' | sed -u 's/^ *\([0-9][0-9]*\).*\( [0-9].*$\)/\1\n#Download Speed\:\2/' | zenity --progress --title "Downloading EmuDeck" --width 600 --auto-close --no-cancel 2>/dev/null chmod +x ~/Applications/EmuDeck.AppImage -~/Applications/EmuDeck.AppImage $sandbox & +~/Applications/EmuDeck.AppImage $sandbox exit diff --git a/install-unstable.sh b/install-unstable.sh index 26542bc51..21ee999ab 100644 --- a/install-unstable.sh +++ b/install-unstable.sh @@ -109,5 +109,5 @@ EMUDECK_URL="$(curl -s ${EMUDECK_GITHUB_URL} | grep -E 'browser_download_url.*Ap mkdir -p ~/Applications curl -L "${EMUDECK_URL}" -o ~/Applications/EmuDeck.AppImage 2>&1 | stdbuf -oL tr '\r' '\n' | sed -u 's/^ *\([0-9][0-9]*\).*\( [0-9].*$\)/\1\n#Download Speed\:\2/' | zenity --progress --title "Downloading EmuDeck" --width 600 --auto-close --no-cancel 2>/dev/null chmod +x ~/Applications/EmuDeck.AppImage -~/Applications/EmuDeck.AppImage $sandbox & +~/Applications/EmuDeck.AppImage $sandbox exit diff --git a/install.sh b/install.sh index 1cf7d4a8d..bf225a055 100644 --- a/install.sh +++ b/install.sh @@ -109,5 +109,4 @@ EMUDECK_URL="$(curl -s ${EMUDECK_GITHUB_URL} | grep -E 'browser_download_url.*Ap mkdir -p ~/Applications curl -L "${EMUDECK_URL}" -o ~/Applications/EmuDeck.AppImage 2>&1 | stdbuf -oL tr '\r' '\n' | sed -u 's/^ *\([0-9][0-9]*\).*\( [0-9].*$\)/\1\n#Download Speed\:\2/' | zenity --progress --title "Downloading EmuDeck" --width 600 --auto-close --no-cancel 2>/dev/null chmod +x ~/Applications/EmuDeck.AppImage -echo "setsid" -setsid ~/Applications/EmuDeck.AppImage $sandbox & \ No newline at end of file +~/Applications/EmuDeck.AppImage $sandbox \ No newline at end of file From e460f01ad0c2d04955fa52fb50a90ab61ba57f91 Mon Sep 17 00:00:00 2001 From: Dragoon Dorise Date: Sun, 29 Dec 2024 20:43:55 +0100 Subject: [PATCH 11/13] bye dolphin & citra zenity --- functions/EmuScripts/emuDeckCitra.sh | 10 ----- functions/EmuScripts/emuDeckDolphin.sh | 53 ++++++++++---------------- 2 files changed, 21 insertions(+), 42 deletions(-) diff --git a/functions/EmuScripts/emuDeckCitra.sh b/functions/EmuScripts/emuDeckCitra.sh index 0d10d0306..e7dda34f8 100755 --- a/functions/EmuScripts/emuDeckCitra.sh +++ b/functions/EmuScripts/emuDeckCitra.sh @@ -304,11 +304,6 @@ Citra_flushSymlinks(){ find "$STEAMPATH/userdata" -name "shortcuts.vdf" -exec sed -i "s|${romsPath}/3ds|${romsPath}/n3ds|g" {} + touch "$HOME/.config/EmuDeck/.citralegacysymlinks" echo "Citra symlink cleanup completed." - zenity --info \ - --text="Citra symlinks have been cleaned. This cleanup was conducted to prevent any potential breakage with symlinks. Place all new ROMs in Emulation/roms/n3ds. Your ROMs have been moved from Emulation/roms/3ds to Emulation/roms/n3ds." \ - --title="Symlink Update" \ - --width=400 \ - --height=300 else echo "Citra symlinks already cleaned." @@ -366,11 +361,6 @@ Citra_flushSymlinks(){ find "$STEAMPATH/userdata" -name "shortcuts.vdf" -exec sed -i "s|${romsPath}/3ds|${romsPath}/n3ds|g" {} + touch "$HOME/.config/EmuDeck/.citrasymlinks" echo "Citra symlink cleanup completed." - zenity --info \ - --text="Citra symlinks have been cleaned. This cleanup was conducted to prevent any potential breakage with symlinks. Place all new ROMs in Emulation/roms/n3ds. Your ROMs have been moved from Emulation/roms/3ds to Emulation/roms/n3ds." \ - --title="Symlink Update" \ - --width=400 \ - --height=300 else echo "Citra symlinks already cleaned." diff --git a/functions/EmuScripts/emuDeckDolphin.sh b/functions/EmuScripts/emuDeckDolphin.sh index 1813ddcf1..4f2d5faaf 100644 --- a/functions/EmuScripts/emuDeckDolphin.sh +++ b/functions/EmuScripts/emuDeckDolphin.sh @@ -41,7 +41,7 @@ Dolphin_install(){ #ApplyInitialSettings Dolphin_init(){ - + setMSG "${Dolphin_emuName}: Apply initial config" echo "" configEmuFP "${Dolphin_emuName}" "${Dolphin_emuPath}" "true" @@ -243,14 +243,14 @@ Dolphin_flushSymlinks(){ rm -rf "$romsPath/gc/metadata.txt" &> /dev/null rm -rf "$romsPath/gc/systeminfo.txt" &> /dev/null - # The Pegasus install was accidentally overwriting the pre-existing n3ds symlink. - # This checks if the gc folder is empty (post-removing the contents above) and if the original gamecube folder is still a folder and not a symlink (for those who have already migrated). - # If all of this is true, the gc folder is deleted and the old symlink is temporarily recreated to proceed with the migration. + # The Pegasus install was accidentally overwriting the pre-existing n3ds symlink. + # This checks if the gc folder is empty (post-removing the contents above) and if the original gamecube folder is still a folder and not a symlink (for those who have already migrated). + # If all of this is true, the gc folder is deleted and the old symlink is temporarily recreated to proceed with the migration. if [[ ! "$( ls -A "$romsPath/gc")" ]] && [ -d "$romsPath/gamecube" ] && [ ! -L "$romsPath/gamecube" ]; then rm -rf "$romsPath/gc" - ln -sfn "$romsPath/gamecube" "$romsPath/gc" - # Temporarily restores old directory structure. - fi + ln -sfn "$romsPath/gamecube" "$romsPath/gc" + # Temporarily restores old directory structure. + fi if [[ -L "$romsPath/gc" && ! $(readlink -f "$romsPath/gc") =~ ^"$romsPath" ]] || [[ -L "$romsPath/gamecube" && ! $(readlink -f "$romsPath/gamecube") =~ ^"$romsPath" ]]; then echo "User has symlinks that don't match expected paths located under $romsPath. Aborting symlink update." @@ -278,22 +278,16 @@ Dolphin_flushSymlinks(){ rsync -avh "$EMUDECKGIT/roms/gc/." "$romsPath/gc/." --ignore-existing - if [ -d "$toolsPath/downloaded_media/gc" ] && [ ! -d "$romsPath/gc/media" ]; then + if [ -d "$toolsPath/downloaded_media/gc" ] && [ ! -d "$romsPath/gc/media" ]; then ln -s "$toolsPath/downloaded_media/gc" "$romsPath/gc/media" fi find "$STEAMPATH/userdata" -name "shortcuts.vdf" -exec sed -i "s|${romsPath}/gamecube|${romsPath}/gc|g" {} + - touch "$HOME/.config/EmuDeck/.dolphinlegacysymlinks" + touch "$HOME/.config/EmuDeck/.dolphinlegacysymlinks" echo "Dolphin symlink cleanup completed." - zenity --info \ - --text="Dolphin symlinks have been cleaned. This cleanup was conducted to prevent any potential breakage with symlinks. Place all new ROMs in Emulation/roms/gc. Your ROMs have been moved from Emulation/roms/gamecube to Emulation/roms/gc." \ - --title="Symlink Update" \ - --width=400 \ - --height=300 - - else + else echo "Dolphin symlinks already cleaned." - fi + fi if [ ! -f "$HOME/.config/EmuDeck/.dolphinsymlinks" ]; then @@ -303,14 +297,14 @@ Dolphin_flushSymlinks(){ rm -rf "$romsPath/gc/metadata.txt" &> /dev/null rm -rf "$romsPath/gc/systeminfo.txt" &> /dev/null - # The Pegasus install was accidentally overwriting the pre-existing n3ds symlink. - # This checks if the gc folder is empty (post-removing the contents above) and if the original gamecube folder is still a folder and not a symlink (for those who have already migrated). - # If all of this is true, the gc folder is deleted and the old symlink is temporarily recreated to proceed with the migration. + # The Pegasus install was accidentally overwriting the pre-existing n3ds symlink. + # This checks if the gc folder is empty (post-removing the contents above) and if the original gamecube folder is still a folder and not a symlink (for those who have already migrated). + # If all of this is true, the gc folder is deleted and the old symlink is temporarily recreated to proceed with the migration. if [[ ! "$( ls -A "$romsPath/gc")" ]] && [ -d "$romsPath/gamecube" ] && [ ! -L "$romsPath/gamecube" ]; then rm -rf "$romsPath/gc" - ln -sfn "$romsPath/gamecube" "$romsPath/gc" - # Temporarily restores old directory structure. - fi + ln -sfn "$romsPath/gamecube" "$romsPath/gc" + # Temporarily restores old directory structure. + fi if [[ -L "$romsPath/gc" && ! $(readlink -f "$romsPath/gc") =~ ^"$romsPath" ]] || [[ -L "$romsPath/gamecube" && ! $(readlink -f "$romsPath/gamecube") =~ ^"$romsPath" ]]; then echo "User has symlinks that don't match expected paths located under $romsPath. Aborting symlink update." @@ -338,21 +332,16 @@ Dolphin_flushSymlinks(){ rsync -avh "$EMUDECKGIT/roms/gc/." "$romsPath/gc/." --ignore-existing - if [ -d "$toolsPath/downloaded_media/gc" ] && [ ! -d "$romsPath/gc/media" ]; then + if [ -d "$toolsPath/downloaded_media/gc" ] && [ ! -d "$romsPath/gc/media" ]; then ln -s "$toolsPath/downloaded_media/gc" "$romsPath/gc/media" fi find "$STEAMPATH/userdata" -name "shortcuts.vdf" -exec sed -i "s|${romsPath}/gamecube|${romsPath}/gc|g" {} + - touch "$HOME/.config/EmuDeck/.dolphinsymlinks" + touch "$HOME/.config/EmuDeck/.dolphinsymlinks" echo "Dolphin symlink cleanup completed." - zenity --info \ - --text="Dolphin symlinks have been cleaned. This cleanup was conducted to prevent any potential breakage with symlinks. Place all new ROMs in Emulation/roms/gc. Your ROMs have been moved from Emulation/roms/gamecube to Emulation/roms/gc." \ - --title="Symlink Update" \ - --width=400 \ - --height=300 - else + else echo "Dolphin symlinks already cleaned." - fi + fi } \ No newline at end of file From 9b967cd3a8182a56fa3cb4f40ca86f99701fe916 Mon Sep 17 00:00:00 2001 From: marianofalzone <140389938+marianofalzone@users.noreply.github.com> Date: Mon, 30 Dec 2024 06:46:36 +0000 Subject: [PATCH 12/13] Added json for Petrophobia (#1373) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fixes dolphin control issues * Revert "fixes dolphin control issues" This reverts commit 32945b947a0306418d563386cd6c0e17030cf6c4. * dolphin for real * versions * forced citra * Fix Cemu - No DSU * GreemDev * path fix * Update emuDeckXenia.sh * Update install.sh (#1369) * fixes dolphin control issues * Revert "fixes dolphin control issues" This reverts commit 32945b947a0306418d563386cd6c0e17030cf6c4. * dolphin for real * versions * forced citra * Fix Cemu - No DSU * GreemDev * path fix * Update install.sh On Ubuntu 24.04.1 LTS is getting this error: installing EmuDeck [36436:1215/124135.236209:FATAL:setuid_sandbox_host.cc(157)] The SUID sandbox helper binary was found, but is not configured correctly. Rather than run without sandboxing I'm aborting now. You need to make sure that /tmp/.mount_EmuDecSYLXPs/chrome-sandbox is owned by root and has mode 4755. bash, linha 111: 36436 Trace/breakpoint trap (imagem do núcleo gravada) ~/Applications/EmuDeck.AppImage $sandbox Something went wrong! Error at 111 NULL: ~/Applications/EmuDeck.AppImage $sandbox I just add an verification for set sandbox to "--no-sandbox" and it works! * Update install.sh Update --------- Co-authored-by: Dragoon Dorise # Conflicts: # install.sh * fix prerequisites installation # Conflicts: # install-early.sh # install-unstable.sh * Added json for Petrophobia --------- Co-authored-by: Dragoon Dorise Co-authored-by: Gabriel Cruz <48037228+gabrielpcruz@users.noreply.github.com> --- install.sh | 4 ++-- store/gbc/Petrophobia.json | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 store/gbc/Petrophobia.json diff --git a/install.sh b/install.sh index bf225a055..0aeab2903 100644 --- a/install.sh +++ b/install.sh @@ -2,7 +2,6 @@ linuxID=$(lsb_release -si) sandbox="" - if [ $linuxID = "Ubuntu" ]; then sandbox="--no-sandbox" fi @@ -109,4 +108,5 @@ EMUDECK_URL="$(curl -s ${EMUDECK_GITHUB_URL} | grep -E 'browser_download_url.*Ap mkdir -p ~/Applications curl -L "${EMUDECK_URL}" -o ~/Applications/EmuDeck.AppImage 2>&1 | stdbuf -oL tr '\r' '\n' | sed -u 's/^ *\([0-9][0-9]*\).*\( [0-9].*$\)/\1\n#Download Speed\:\2/' | zenity --progress --title "Downloading EmuDeck" --width 600 --auto-close --no-cancel 2>/dev/null chmod +x ~/Applications/EmuDeck.AppImage -~/Applications/EmuDeck.AppImage $sandbox \ No newline at end of file +~/Applications/EmuDeck.AppImage $sandbox +exit \ No newline at end of file diff --git a/store/gbc/Petrophobia.json b/store/gbc/Petrophobia.json new file mode 100644 index 000000000..a0e6957ca --- /dev/null +++ b/store/gbc/Petrophobia.json @@ -0,0 +1,18 @@ +{ + "system": "gbc", + "status": "true", + "logo": "logo_gbc", + "title": "Petrophobia", + "url": "https://orbistertius.itch.io/petrophobia", + "file": "https://raw.githubusercontent.com/EmuDeck/emudeck-homebrew/main/gbc/petrophobia.zip", + "description": "A story-driven adventure game about colonialism and petroleum, loosely based on the short story 'The Mark of the Beast' by Rudyard Kipling, a passage from Thomas Pynchon's 'Against the Day', and the oil boom of the late 19th and early 20th centuries. TRIGGER WARNING: Themes of torture, racism, homophobia, and misogyny.", + "pictures": { + "screenshots": [ + "https://raw.githubusercontent.com/EmuDeck/emudeck-homebrew/main/downloaded_media/gbc/screenshots/homebrew/Petrophobia.png?raw=true" + ], + "titlescreens": [ + "https://raw.githubusercontent.com/EmuDeck/emudeck-homebrew/main/downloaded_media/gbc/titlescreens/homebrew/Petrophobia.png?raw=true" + ] + }, + "tags": ["adventure"] +} From 29ee1cf943bd7753478720f1be6f9c18883b65b3 Mon Sep 17 00:00:00 2001 From: Junian Triajianto <3881052+junian@users.noreply.github.com> Date: Mon, 30 Dec 2024 13:56:38 +0700 Subject: [PATCH 13/13] Update Lime3DS repo. (#1379) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fixes dolphin control issues * Revert "fixes dolphin control issues" This reverts commit 32945b947a0306418d563386cd6c0e17030cf6c4. * dolphin for real * versions * forced citra * Fix Cemu - No DSU * GreemDev * path fix * Update emuDeckXenia.sh * Update install.sh (#1369) * fixes dolphin control issues * Revert "fixes dolphin control issues" This reverts commit 32945b947a0306418d563386cd6c0e17030cf6c4. * dolphin for real * versions * forced citra * Fix Cemu - No DSU * GreemDev * path fix * Update install.sh On Ubuntu 24.04.1 LTS is getting this error: installing EmuDeck [36436:1215/124135.236209:FATAL:setuid_sandbox_host.cc(157)] The SUID sandbox helper binary was found, but is not configured correctly. Rather than run without sandboxing I'm aborting now. You need to make sure that /tmp/.mount_EmuDecSYLXPs/chrome-sandbox is owned by root and has mode 4755. bash, linha 111: 36436 Trace/breakpoint trap (imagem do núcleo gravada) ~/Applications/EmuDeck.AppImage $sandbox Something went wrong! Error at 111 NULL: ~/Applications/EmuDeck.AppImage $sandbox I just add an verification for set sandbox to "--no-sandbox" and it works! * Update install.sh Update --------- Co-authored-by: Dragoon Dorise # Conflicts: # install.sh * fix prerequisites installation # Conflicts: # install-early.sh # install-unstable.sh * Revert "GreemDev" This reverts commit be0a81ba20b02cc120707ccba4b499c35f60ee1a. * Reapply "GreemDev" This reverts commit 3b8193f0465fe3976dc26d5a1c6a29fa0a2f3dab. * new Ryu url * Update Lime3DS repo. Sadly Lime3DS was archived on Nov 17, 2024. But the binaries still available here: https://github.com/Lime3DS/lime3ds-archive/releases * Update android Lime3DS repo --------- Co-authored-by: Dragoon Dorise Co-authored-by: Gabriel Cruz <48037228+gabrielpcruz@users.noreply.github.com> --- android/functions/EmuScripts/Android_Lime3DS.sh | 4 ++-- functions/EmuScripts/emuDeckLime3DS.sh | 2 +- install.sh | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/android/functions/EmuScripts/Android_Lime3DS.sh b/android/functions/EmuScripts/Android_Lime3DS.sh index 9ef244d79..862cbc8ed 100644 --- a/android/functions/EmuScripts/Android_Lime3DS.sh +++ b/android/functions/EmuScripts/Android_Lime3DS.sh @@ -2,7 +2,7 @@ function Android_Lime3DS_install(){ setMSG "Installing Citra" - temp_url="$(getLatestReleaseURLGH "Lime3DS/Lime3DS" ".apk")" + temp_url="$(getLatestReleaseURLGH "Lime3DS/lime3ds-archive" ".apk")" temp_emu="citra" Android_ADB_dl_installAPK $temp_emu $temp_url } @@ -22,4 +22,4 @@ function Android_Lime3DS_setup(){ function Android_Lime3DS_IsInstalled(){ package="org.citra.emu" Android_ADB_appInstalled $package -} \ No newline at end of file +} diff --git a/functions/EmuScripts/emuDeckLime3DS.sh b/functions/EmuScripts/emuDeckLime3DS.sh index d02433446..1e4e716a1 100755 --- a/functions/EmuScripts/emuDeckLime3DS.sh +++ b/functions/EmuScripts/emuDeckLime3DS.sh @@ -12,7 +12,7 @@ Lime3DS_texturesPath="$HOME/.config/lime3ds-emu/load/textures" Lime3DS_install(){ echo "Begin $Lime3DS_emuName Install" local showProgress="$1" - if installEmuAI "$Lime3DS_emuName" "" "$(getReleaseURLGH "Lime3DS/Lime3DS" "tar.gz" "")" "lime3ds" "tar.gz" "emulator" "$showProgress"; then #lime3ds-gui.AppImage + if installEmuAI "$Lime3DS_emuName" "" "$(getReleaseURLGH "Lime3DS/lime3ds-archive" "tar.gz" "")" "lime3ds" "tar.gz" "emulator" "$showProgress"; then #lime3ds-gui.AppImage mkdir "$HOME/Applications/lime3ds-temp" tar -xvzf "$HOME/Applications/lime3ds.tar.gz" -C "$HOME/Applications/lime3ds-temp" --strip-components 1 if [ -f "$HOME/Applications/lime3ds-temp/lime3ds-gui.AppImage" ]; then diff --git a/install.sh b/install.sh index 0aeab2903..b439c643e 100644 --- a/install.sh +++ b/install.sh @@ -2,10 +2,12 @@ linuxID=$(lsb_release -si) sandbox="" + if [ $linuxID = "Ubuntu" ]; then sandbox="--no-sandbox" fi clear + if [ "$linuxID" == "SteamOS" ]; then echo "Installing EmuDeck" else