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

Revert "hotfix cloud.sh"

Browse source 
This reverts commit 8175c99eaa.
This commit is contained in:
Dragoon Dorise 2024-03-07 10:58:32 +01:00
parent 3a80d90187
commit 4491f31be0
30 changed files with 8 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
functions/cloudServicesManager.sh
View file

@ -76,10 +76,10 @@ manageServicesMenu() {
if [ $? != 0 ]; then
csmMainMenu
fi
# Delete all old scripts that match file names from the github repo
for i in "${arrAll[@]}"; do
rm "$romsPath/cloud/$i"
rm "$romsPath/cloud/$i"
done
# Setup selected scripts
@ -91,7 +91,7 @@ manageServicesMenu() {
# Import steam profile
rsync -r "$EMUDECKGIT/configs/steam-input/emudeck_cloud_controller_config.vdf" "$HOME/.steam/steam/controller_base/templates/"
# Notify to update & run SRM
csmSRMNotification
@ -162,7 +162,7 @@ manageRPSMenu() {
else
arrAllRP+=(false "Spotify")
fi
SteamLink_IsInstalled
ans=$?
if [ "$ans" == "1" ]; then
@ -287,7 +287,7 @@ manageRPSMenu() {
--pulsate \
--auto-close \
--width=300
# Notify to update & run SRM
csmSRMNotification
@ -313,7 +313,7 @@ changeSettingsMenu() {
else
arrBrowsOpts+=(false "System Default: $defaultBrowser" false)
fi
# Add supported browsers to selection list
for brows in "${arrSupBrows[@]}"; do
if [[ "$(flatpak --columns=app list | grep "${brows}")" == *"${brows}"* ]]; then
@ -376,7 +376,7 @@ changeLine() {
local OLD=$(printf '%s\n' "$KEYWORD" | sed -e 's/[]\/$*.^[]/\\&/g')
local NEW=$(printf '%s\n' "$REPLACE" | sed -e 's/[]\/$*.^[]/\\&/g')
sed -i "/^${OLD}/c\\${NEW}" "$FILE"
}
@ -457,7 +457,6 @@ fixCloudScripts() {
DEVICESCALEFACTOR_temp="$DEVICESCALEFACTOR"
rm "$romsPath/cloud/cloud.conf"
cp "$LOCALCLOUDFILES/cloud.conf" "$romsPath/cloud"
cp "$LOCALCLOUDFILES/cloud.sh" "$romsPath/cloud"
CLOUDSETTINGSFILE="$romsPath/cloud/cloud.conf"
source "$CLOUDSETTINGSFILE"
setCloudSetting BROWSERAPP "$BROWSERAPP_temp"
@ -483,7 +482,6 @@ mkdir -p "$romsPath/cloud"
mkdir -p "$romsPath/remoteplay"
if [ ! -f "$romsPath/cloud/cloud.conf" ]; then
cp "$LOCALCLOUDFILES/cloud.conf" "$romsPath/cloud"
cp "$LOCALCLOUDFILES/cloud.sh" "$romsPath/cloud"
CLOUDSETTINGSFILE="$romsPath/cloud/cloud.conf"
source "$CLOUDSETTINGSFILE"

1
tools/cloud/Amazon Luna (2020).sh
View file

@ -3,5 +3,4 @@
LINK="https://luna.amazon.com/"
source ./cloud.conf
source ./cloud.sh
browsercommand

3
tools/cloud/Amazon Prime Video (2006).sh
View file

@ -3,5 +3,4 @@
LINK="https://www.amazon.com/video"
source ./cloud.conf
source ./cloud.sh
browsercommand
browsercommand

1
tools/cloud/Apple TV.sh
View file

@ -3,5 +3,4 @@
LINK="https://tv.apple.com/"
source ./cloud.conf
source ./cloud.sh
browsercommand

1
tools/cloud/Crave.sh
View file

@ -3,5 +3,4 @@
LINK="https://www.crave.ca/"
source ./cloud.conf
source ./cloud.sh
browsercommand

1
tools/cloud/Crunchyroll.sh
View file

@ -3,5 +3,4 @@
LINK="https://www.crunchyroll.com/"
source ./cloud.conf
source ./cloud.sh
browsercommand

1
tools/cloud/Discord.sh
View file

@ -3,5 +3,4 @@
LINK="https://discord.com/app"
source ./cloud.conf
source ./cloud.sh
browsercommand

1
tools/cloud/Disney+.sh
View file

@ -3,5 +3,4 @@
LINK="https://www.disneyplus.com/"
source ./cloud.conf
source ./cloud.sh
browsercommand

1
tools/cloud/Emby Theater (Program).sh
View file

@ -3,5 +3,4 @@
LINK="https://emby.media/"
source ./cloud.conf
source ./cloud.sh
browsercommand

1
tools/cloud/HBO Max.sh
View file

@ -3,5 +3,4 @@
LINK="https://www.max.com/"
source ./cloud.conf
source ./cloud.sh
browsercommand

1
tools/cloud/Home Assistant (Program).sh
View file

@ -3,5 +3,4 @@
LINK="https://demo.home-assistant.io/"
source ./cloud.conf
source ./cloud.sh
browsercommand

1
tools/cloud/Hulu.sh
View file

@ -3,5 +3,4 @@
LINK="https://www.hulu.com/"
source ./cloud.conf
source ./cloud.sh
browsercommand

1
tools/cloud/Jellyfin.sh
View file

@ -3,5 +3,4 @@
LINK="http://localhost:8096"
source ./cloud.conf
source ./cloud.sh
browsercommand

1
tools/cloud/Nebula.sh
View file

@ -3,5 +3,4 @@
LINK="https://nebula.tv/"
source ./cloud.conf
source ./cloud.sh
browsercommand

1
tools/cloud/Netflix.sh
View file

@ -3,5 +3,4 @@
LINK="https://www.netflix.com/"
source ./cloud.conf
source ./cloud.sh
browsercommand

1
tools/cloud/Paramount+.sh
View file

@ -3,5 +3,4 @@
LINK="https://www.paramountplus.com/"
source ./cloud.conf
source ./cloud.sh
browsercommand

1
tools/cloud/Peacock TV (2020).sh
View file

@ -3,5 +3,4 @@
LINK="https://www.peacocktv.com/"
source ./cloud.conf
source ./cloud.sh
browsercommand

1
tools/cloud/Plex.sh
View file

@ -3,5 +3,4 @@
LINK="https://app.plex.tv/"
source ./cloud.conf
source ./cloud.sh
browsercommand

1
tools/cloud/Pocket Casts.sh
View file

@ -4,6 +4,5 @@ LINK="https://play.pocketcasts.com"
# shellcheck source=./cloud.conf
source ./cloud.conf
source ./cloud.sh
"/usr/bin/flatpak" run "${FLATPAKOPTIONS}" "${BROWSERAPP}" @@u @@ "${BROWSEROPTIONS}" ${LINK}

1
tools/cloud/Spotify.sh
View file

@ -3,5 +3,4 @@
LINK="https://open.spotify.com/"
source ./cloud.conf
source ./cloud.sh
browsercommand

1
tools/cloud/TikTok.sh
View file

@ -3,5 +3,4 @@
LINK="https://www.tiktok.com/"
source ./cloud.conf
source ./cloud.sh
browsercommand

1
tools/cloud/Twitch.sh
View file

@ -3,5 +3,4 @@
LINK="https://www.twitch.tv/"
source ./cloud.conf
source ./cloud.sh
browsercommand

1
tools/cloud/Twitter.sh
View file

@ -3,5 +3,4 @@
LINK="https://twitter.com/"
source ./cloud.conf
source ./cloud.sh
browsercommand

1
tools/cloud/Vimeo (2004).sh
View file

@ -3,5 +3,4 @@
LINK="https://vimeo.com/"
source ./cloud.conf
source ./cloud.sh
browsercommand

1
tools/cloud/Xbox Cloud Gaming (xCloud) (2019).sh
View file

@ -3,5 +3,4 @@
LINK="https://www.xbox.com/play"
source ./cloud.conf
source ./cloud.sh
browsercommand

1
tools/cloud/YouTube Music (2015).sh
View file

@ -3,5 +3,4 @@
LINK="https://music.youtube.com/"
source ./cloud.conf
source ./cloud.sh
browsercommand

1
tools/cloud/YouTube TV.sh
View file

@ -3,5 +3,4 @@
LINK="https://tv.youtube.com/"
source ./cloud.conf
source ./cloud.sh
browsercommand

1
tools/cloud/YouTube.sh
View file

@ -3,5 +3,4 @@
LINK="https://www.youtube.com/"
source ./cloud.conf
source ./cloud.sh
browsercommand

14
tools/cloud/cloud.sh
View file

@ -1,14 +0,0 @@
#!/bin/bash
# prevent possible LD_PRELOAD entries from steam being passed to browser
LD_PRELOAD=""
browsercommand() {
{ # try flatpak with specified browserapp
"/usr/bin/flatpak" run ${FLATPAKOPTIONS} ${BROWSERAPP} @@u @@ ${BROWSEROPTIONS} ${LINK}
} || { # if that fails, try running the browserapp natively
${BROWSERAPP} ${BROWSEROPTIONS} ${LINK}
} || { # if browserapp fails, try looking up and using default browser given by xdg-settings
DEFAULTBROWSERAPP=$(cat /usr/share/applications/"$(xdg-settings get default-web-browser)" | grep Exec= | head -n 1 | cut -d = -f 2 | cut -d " " -f1)
${DEFAULTBROWSERAPP} ${BROWSEROPTIONS} ${LINK}
}
}

1
tools/cloud/webRcade.sh
View file

@ -3,5 +3,4 @@
LINK="https://play.webrcade.com/"
source ./cloud.conf
source ./cloud.sh
browsercommand