Merge branch 'Boria138-update-autoinstall'

data_from_portwine/scripts/pw_autoinstall/PW_ANKAMA

@@ -4,7 +4,7 @@
 export LAUNCH_PARAMETERS=("/S")
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Ankama-Setup.exe"
 start_portwine
-if wget -O "${PW_AUTOINSTALL_EXE}" "https://download.ankama.com/launcher/full/win/" 
+if try_download "download.ankama.com/launcher/full/win/" "${PW_AUTOINSTALL_EXE}" 
 then
     pw_start_progress_bar_block "${loc_gui_installing_the} Ankama Launcher. ${loc_gui_please_wait} "
     pw_run "${PW_AUTOINSTALL_EXE}"

data_from_portwine/scripts/pw_autoinstall/PW_BSR

+#!/usr/bin/env bash
+# Author: Boria138
+########################################################################
+export LAUNCH_PARAMETERS=("/VERYSILENT /SUPPRESSMSGBOXES")
+export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/bsr_setup.exe"
+start_portwine
+if try_download "battleofspaceraiders.com/install/bsr_setup.exe" "${PW_AUTOINSTALL_EXE}"
+then
+    pw_start_progress_bar_block "${loc_gui_installing_the} Battle Of Space Raiders. ${loc_gui_please_wait} "
+    pw_run "${PW_AUTOINSTALL_EXE}"
+    portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Battle Of Space Raiders/aops.exe"
+    try_remove_file "${PW_AUTOINSTALL_EXE}"
+    try_remove_file "${portwine_exe}.ppdb"
+    kill_portwine
+    pw_stop_progress_bar
+    export PORTWINE_CREATE_SHORTCUT_NAME="Battle Of Space Raiders"
+    portwine_create_shortcut
+fi
+stop_portwine

data_from_portwine/scripts/pw_autoinstall/PW_CALIBER

@@ -20,16 +20,8 @@ if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ] ; then
     [[ "${UNPACK_STATUS}" != 0 ]] && exit 1
 fi
 
-try_download_caliber () {
-    set -o pipefail
-    wget -t 5 -T 3 "$1" --no-check-certificate --output-document="$2" 2>&1 | \
-    tr '\r' '\n' | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9,.]\+.\) \(.*\)/\1\n#Downloading at \1\/, \2\/s, ETA \3/; s/^20[0-9][0-9].*/#Done./' | \
-    "${pw_yad_v12_3}" --center --progress --percentage=0 --title="Download $(basename $1)" --text=Starting... --auto-close --auto-kill --width=500 --height=90
-    [ "${PIPESTATUS[0]}" != 0 ] && print_error "failed to download $1. Scipping." && return 1 || return 0
-}
-
 start_portwine
-if try_download_caliber "https://cdn.playcaliber.com/p1/a88c3b70f76a0e56b1e08b62c9895cfe/launcher/setup/CaliberSetup.exe" "${PW_AUTOINSTALL_EXE}"
+if try_download "https://caliber-files.gcdn.co/caliber-s3/p1/a88c3b70f76a0e56b1e08b62c9895cfe/launcher/setup/CaliberSetup.exe" "${PW_AUTOINSTALL_EXE}"
 then
     pw_start_progress_bar_block "${loc_gui_installing_the} CALIBER. ${loc_gui_please_wait} "
     pw_kill_autostart VC_redist.x64.exe 3 &

data_from_portwine/scripts/start.sh

@@ -768,7 +768,8 @@ else
     --field="   Steam (unstable)"!"$PW_GUI_ICON_PATH/steam.png"!"":"FBTN" '@bash -c "button_click PW_STEAM"' \
     --field="   Path of Exile"!"$PW_GUI_ICON_PATH/poe.png"!"":"FBTN" '@bash -c "button_click PW_POE"' \
     --field="   Guild Wars 2"!"$PW_GUI_ICON_PATH/gw2.png"!"":"FBTN" '@bash -c "button_click PW_GUILD_WARS_2"' \
-    --field="   Genshin Impact"!"$PW_GUI_ICON_PATH/genshinimpact.png"!"":"FBTN" '@bash -c "button_click PW_GENSHIN_IMPACT"' 2>/dev/null  &
+    --field="   Genshin Impact"!"$PW_GUI_ICON_PATH/genshinimpact.png"!"":"FBTN" '@bash -c "button_click PW_GENSHIN_IMPACT"' \
+    --field="   Battle Of Space Raiders"!"$PW_GUI_ICON_PATH/bsr.png"!"":"FBTN" '@bash -c "button_click PW_BSR"' 2>/dev/null  &
     
     # --field="   Electronic Arts App"!"$PW_GUI_ICON_PATH/eaapp.png"!"":"FBTN" '@bash -c "button_click PW_EAAPP"' 
     # --field="   Secret World Legends (ENG)"!"$PW_GUI_ICON_PATH/swl.png"!"":"FBTN" '@bash -c "button_click PW_SWL"'