diff --git a/NonSteamLaunchers.sh b/NonSteamLaunchers.sh index 7cffa82..940458c 100644 --- a/NonSteamLaunchers.sh +++ b/NonSteamLaunchers.sh @@ -168,7 +168,7 @@ elif [[ -f "$origin_path2" ]]; then else # Origin is not installed origin_value="FALSE" - origin_text="Origin" + origin_text="Origin - Broken, Use at own risk" fi # Check if Uplay is installed @@ -583,6 +583,7 @@ options="$selected_launchers" + # Check if the cancel button was clicked if [ $? -eq 1 ] && [[ $options != "Start Fresh" ]] && [[ $options != "Move to SD Card" ]] && [[ $options != "Uninstall" ]] && [[ $options != "Find Games" ]]; then # The cancel button was clicked @@ -1452,10 +1453,10 @@ ubi_url=https://ubi.li/4vxt9 ubi_file=~/Downloads/NonSteamLaunchersInstallation/UplayInstaller.exe # Set the URL to download the fourth file from -origin_url=https://taskinoz.com/downloads/OriginSetup-10.5.119.52718.exe +origin_url=https://eaassets-a.akamaihd.net/Origin-Client-Download/origin/live/OriginThinSetup.exe # Set the path to save the fourth file to -origin_file=~/Downloads/NonSteamLaunchersInstallation/OriginSetup-10.5.119.52718.exe +origin_file=~/Downloads/NonSteamLaunchersInstallation/OriginThinSetup.exe # Set the URL to download the fifth file from battle_url="https://www.battle.net/download/getInstallerForGame?os=win&gameProgram=BATTLENET_APP&version=Live" @@ -1789,6 +1790,17 @@ if [[ $options == *"Origin"* ]]; then # Terminate any processes with the name Origin.exe pkill Origin.exe + # Download version.dll file + if [ ! -f "~/Downloads/NonSteamLaunchersInstallation/version.dll" ]; then + echo "Downloading version.dll file" + wget https://github.com/p0358/Fuck_off_EA_App/releases/download/v2/version.dll -O ~/Downloads/NonSteamLaunchersInstallation/version.dll + fi + + # Move version.dll file to desired location + echo "Moving version.dll file to desired location" + mv ~/Downloads/NonSteamLaunchersInstallation/version.dll "$HOME/.local/share/Steam/steamapps/compatdata/$appid/pfx/drive_c/Program Files (x86)/Origin/" + + # Wait for the ORIGIN file to finish running wait @@ -2456,14 +2468,13 @@ rm -rf ~/Downloads/NonSteamLaunchersInstallation -echo "100" -echo "# Installation Complete - Steam will now restart. Your launchers will be in your library!...Food for thought...do Jedis use Force Compatability?" -sleep 5 + echo "100" + echo "# Installation Complete - Steam will now restart. Your launchers will be in your library!...Food for thought...do Jedis use Force Compatability?" ) | zenity --progress \ --title="Update Status" \ --text="Starting update...please wait..." --width=450 --height=350\ - --percentage=0 --auto-close --no-cancel + --percentage=0 --auto-close wait @@ -3093,27 +3104,28 @@ create_new_entry('$chromedirectory', 'Amazon Luna', '$lunachromelaunchoptions', # Iterate over each custom website for custom_website in custom_websites: - # Remove any leading or trailing spaces from the custom website URL - custom_website = custom_website.strip() + # Check if the custom website is not an empty string + if custom_website: + # Remove any leading or trailing spaces from the custom website URL + custom_website = custom_website.strip() - # Remove the 'http://' or 'https://' prefix and the 'www.' prefix, if present - clean_website = custom_website.replace('http://', '').replace('https://', '').replace('www.', '') + # Remove the 'http://' or 'https://' prefix and the 'www.' prefix, if present + clean_website = custom_website.replace('http://', '').replace('https://', '').replace('www.', '') - # Extract the name of the website by removing everything after the first '/' - website_name = clean_website.split('/')[0] + # Extract the name of the website by removing everything after the first '/' + website_name = clean_website.split('/')[0] - # Remove the top-level domain (e.g. '.com') from the website name - website_name = website_name.rsplit('.', 1)[0] + # Remove the top-level domain (e.g. '.com') from the website name + website_name = website_name.rsplit('.', 1)[0] - # Capitalize the first letter of the website name - website_name = website_name.capitalize() + # Capitalize the first letter of the website name + website_name = website_name.capitalize() - # Define the launch options for this website - chromelaunch_options = f'run --branch=stable --arch=x86_64 --command=/app/bin/chrome --file-forwarding com.google.Chrome @@u @@ --window-size=1280,800 --force-device-scale-factor=1.00 --device-scale-factor=1.00 --kiosk https://{clean_website}/ --chrome-kiosk-type=fullscreen --no-first-run --enable-features=OverlayScrollbar' + # Define the launch options for this website + chromelaunch_options = f'run --branch=stable --arch=x86_64 --command=/app/bin/chrome --file-forwarding com.google.Chrome @@u @@ --window-size=1280,800 --force-device-scale-factor=1.00 --device-scale-factor=1.00 --kiosk https://{clean_website}/ --chrome-kiosk-type=fullscreen --no-first-run --enable-features=OverlayScrollbar' - - # Call the create_new_entry function for this website - create_new_entry('$chromedirectory', website_name, chromelaunch_options, '$chrome_startdir') + # Call the create_new_entry function for this website + create_new_entry('$chromedirectory', website_name, chromelaunch_options, '$chrome_startdir')