fixed battlnet and ea app

~smoother installation
This commit is contained in:
Roy 2024-05-08 13:04:09 -07:00 committed by GitHub
parent 393779f975
commit d605ad0f78
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1270,6 +1270,20 @@ if [[ $options == *"Battle.net"* ]]; then
# Run the BATTLE file using Proton with the /passive option # Run the BATTLE file using Proton with the /passive option
echo "Running BATTLE file using Proton with the /passive option" echo "Running BATTLE file using Proton with the /passive option"
"$STEAM_RUNTIME" "$proton_dir/proton" run "$battle_file" Battle.net-Setup.exe --lang=enUS --installpath="C:\Program Files (x86)\Battle.net" "$STEAM_RUNTIME" "$proton_dir/proton" run "$battle_file" Battle.net-Setup.exe --lang=enUS --installpath="C:\Program Files (x86)\Battle.net"
max_attempts=20
attempt=0
while true; do
if pgrep -f "Battle.net.exe" || pgrep -f "BlizzardError.exe" > /dev/null; then
pkill -f "Battle.net.exe" || pkill -f "BlizzardError.exe"
break
fi
sleep 1
((attempt++))
if [ "$attempt" -ge "$max_attempts" ]; then
echo "Timeout: Battle.net process did not terminate."
break
fi
done
wait wait
# Run the BATTLE file using Proton with the /passive option # Run the BATTLE file using Proton with the /passive option
echo "Running BATTLE file using Proton with the /passive option" echo "Running BATTLE file using Proton with the /passive option"
@ -1279,8 +1293,8 @@ if [[ $options == *"Battle.net"* ]]; then
max_attempts=20 max_attempts=20
attempt=0 attempt=0
while true; do while true; do
if pgrep -f "Battle.net.exe" > /dev/null; then if pgrep -f "Battle.net.exe" || pgrep -f "BlizzardError.exe" > /dev/null; then
pkill -f "Battle.net.exe" pkill -f "Battle.net.exe" || pkill -f "BlizzardError.exe"
break break
fi fi
sleep 1 sleep 1
@ -1291,7 +1305,6 @@ if [[ $options == *"Battle.net"* ]]; then
fi fi
done done
fi fi
wait wait
@ -1388,23 +1401,25 @@ if [[ $options == *"EA App"* ]]; then
echo "Running EA App file using Proton with the /passive option" echo "Running EA App file using Proton with the /passive option"
"$STEAM_RUNTIME" "$proton_dir/proton" run "$eaapp_file" /quiet "$STEAM_RUNTIME" "$proton_dir/proton" run "$eaapp_file" /quiet
counter=0 max_attempts=20
attempt=0
while true; do while true; do
if pgrep -f "EABackgroundService.exe" > /dev/null; then if pgrep -f "EADesktop.exe" || pgrep -f "EABacgroundSer" > /dev/null; then
pkill -f "EABackgroundService.exe" pkill -f "EADesktop.ex" || pkill -f "EABacgroundSer"
break break
fi fi
sleep 1 sleep 1
counter=$((counter + 1)) ((attempt++))
if [ $counter -ge 10 ]; then if [ "$attempt" -ge "$max_attempts" ]; then
echo "Timeout: EABacgroundSer process did not terminate."
break break
fi fi
done done
# Wait for the EA App file to finish running
wait
fi fi
wait wait
echo "89" echo "89"
echo "# Downloading & Installing itch.io...please wait..." echo "# Downloading & Installing itch.io...please wait..."