From 21c21f87693c724cd17f1a89fa1605b58aac92ce Mon Sep 17 00:00:00 2001 From: castro-fidel Date: Mon, 31 Oct 2022 21:46:00 +0300 Subject: [PATCH] Scripts version 2138 --- LICENSE | 0 data_from_portwine/changelog_eng | 3 ++ data_from_portwine/changelog_rus | 3 ++ data_from_portwine/img/gui/caliber.png | Bin 0 -> 1719 bytes data_from_portwine/scripts/functions_helper | 8 +++- .../scripts/portwine_db/Battle.net_Launcher | 2 +- .../scripts/pw_autoinstall/PW_CALIBER | 44 ++++++++++++++++++ data_from_portwine/scripts/start.sh | 6 +++ data_from_portwine/scripts/var | 2 +- 9 files changed, 64 insertions(+), 4 deletions(-) mode change 100644 => 100755 LICENSE create mode 100644 data_from_portwine/img/gui/caliber.png create mode 100644 data_from_portwine/scripts/pw_autoinstall/PW_CALIBER diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index a48341e1..daa1b943 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,9 @@ You can help us in the development of the project on the website: boosty.to/linu ----------------------------------------- Changelog: +###Scripts version 2138### +* added "Calibre" in AUTOINSTALL (thanks chal55rus) + ###Scripts version 2137### * updated version of PROTON_LG 7.32 based on PROTON GE 7.38 (Added support for running games: "Overwatch 2" and "Uncharted: Legacy of Thieves") * minor script optimizations for running PortProton diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 5de6db18..b10bf781 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,9 @@ ----------------------------------------- История изменений: +###Scripts version 2138### +* добавлена установка игры Калибр (спасибо chal55rus за помощь) + ###Scripts version 2137### * обновлена версия PROTON_LG 7.32 на основе PROTON GE 7.38 (Добавлена поддержка запуска игр: "Overwatch 2" и "Uncharted: Legacy of Thieves") * небольшие оптимизации скриптов для запуска PortProton diff --git a/data_from_portwine/img/gui/caliber.png b/data_from_portwine/img/gui/caliber.png new file mode 100644 index 0000000000000000000000000000000000000000..3599faac58b95c0e6b56990549880c9c358150be GIT binary patch literal 1719 zcmV;o21xmdP)e@h?PIUS0iD)V*(M;S!VCYnK_r4GvH5}y5$C9U=>SFDiM#&rxzkE z&$Q7?06$?(ckPMk=_LP-k6V1I-VCW;|L^;Av}X-h2Vbl3sBSwY;c?;QYROi-Dcq$O zw5;%faMY0l3STNcQ{yMa`5M0|c4kwP;8#5(`5&D5!Fs{5ga?KDEVHcF&!cVUUG zQoCjL;F2OioCq1pEMrn)NNQ0s``Z`$_D!)O9$o%66&!KoDTp^JYFWA(Qgfmk@|jdr z?!WVNb0fpG?!h=TKYHG4KeTK^b<6WU4?VAX1WgZcUTpYRB&V@=(YG2}-#&!a;q;=R zWp?0f1H$*V=4jtilT3du2QMekk%rD|Xj`mhRbS`$4rbTniLPLG4+dm^Xz2^0?q}b6 zt8=9Q000SaNLh0L01FZT01FZU(%pXi000E;Nkl^PIVk zwf9iGYZS;5;h<>N{UV1(q92`7bsMa()87-iP z2L%Q3%F0T9eSOUh>F(~1x3skIz`#HbUV6TM7z8N+@zm5*BZKB9YHDgEkk9V|LWU2q znEnVN2HZdhz=EVH$>WmZ;dQL@fnUS3#IQW7JBMzR+d7c4C;jZuKA1g+n4!tF4i zWgL7iE-oxSKAxqgr!zMueSJJ8CWf!Bu5u3#4;~Q_!E0-4`QziG;H#*p5FpOZ z&J?-V*HFn$jf#&Gw$n5Ry+2P@#cn=K?74L5e^O&oz zuV=~0$!uq5hYb%83l_H+ZB0LASy@@CMeINlcD}f{D0cOy1h3JN3HH3a zJTcnY*{Q^*r>F5gjBS1lsO!$Bu`IIfeQfW zzjzTeKR+)<6c#TpFV@u5WY+C^=!S-dR7<_RxGdGADnwXXSXdAoYiny_q#U<+_fp{W z^psInDDqUURl2ZABLMgJ_kzjQ)m4ng$H(smfU?}!*l1GT3VFQ0zpu%J7(nTz8|_^n zHa0d`R8*8WLIkrRA*F3;@;lLAL`DqbO4W=l&;mf9A1Pu^uzwl!rR9v;Lz0Q}q0(V@wN+YjzTVKFRLrVt^xMn^~4 z^71lscX!uht*WZR{D0O|<+x#K#R`Qwp?6BCvEm#MhByKC|&&>tXfB-ql@QqjOfMnph{34?=! zEF&XBB@`AGCX9fn`Cum}C(1gGrJ$eyxvY{w&>F@KbRhR>-l!K))FUv0XZIh*>?s3D2&nOreUabPdgPoxs1sZ2xq|AkWQA9IG~`VVrAjXnH(fd2ph N002ovPDHLkV1mnqBpv_& literal 0 HcmV?d00001 diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 7b8a28d2..4499a2d0 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -527,14 +527,18 @@ kill_portwine () { export -f kill_portwine pw_kill_autostart () { + if [[ -z "${2}" ]] + then SWAIT=5 + else SWAIT="${2}" + fi sleep 5 while true ; do if [[ -z "`ps aux | grep -m 1 "$1" | grep -v grep | awk '{print $2}'`" ]] && [[ ! -z "`ps aux | grep wrap | grep -v grep | grep -i ${portname} | head -n 1`" ]] ; then echo -e "PID "$1" not found" - sleep 5 + sleep "${SWAIT}" else - sleep 5 + sleep "${SWAIT}" kill_portwine break fi diff --git a/data_from_portwine/scripts/portwine_db/Battle.net_Launcher b/data_from_portwine/scripts/portwine_db/Battle.net_Launcher index 97ab02eb..6a8c8d2b 100755 --- a/data_from_portwine/scripts/portwine_db/Battle.net_Launcher +++ b/data_from_portwine/scripts/portwine_db/Battle.net_Launcher @@ -6,7 +6,7 @@ #Rating=5 ################################################ #export PW_COMMENT_DB="We recommend using PROTON_GE + VULKAN!" -export PW_WINE_USE=PROTON_GE +# export PW_WINE_USE=PROTON_GE export PW_VULKAN_USE=1 export LAUNCH_PARAMETERS="" export WINEDLLOVERRIDES="locationapi=" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_CALIBER b/data_from_portwine/scripts/pw_autoinstall/PW_CALIBER new file mode 100644 index 00000000..1199c18f --- /dev/null +++ b/data_from_portwine/scripts/pw_autoinstall/PW_CALIBER @@ -0,0 +1,44 @@ +#!/usr/bin/env bash +# Author: chal55rus +######################################################################## +export PW_PREFIX_NAME="CALIBER" +export LAUNCH_PARAMETERS=("/VERYSILENT") +export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/CaliberSetup.exe" +export PW_WINE_USE=PROTON_STEAM_6.3-8 + +if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ] ; then + if try_download "github.com/Castro-Fidel/wine_builds/releases/download/${PW_WINE_USE}/${PW_WINE_USE}.tar.xz" \ + "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" ; then + if unpack_tar_xz "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" "${PORT_WINE_PATH}/data/dist/" ; then + try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" + UNPACK_STATUS=0 + else + try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" + try_remove_dir "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" + fi + fi + [[ "${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_new}" --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}" +then + pw_start_progress_bar_block "Installing the CALIBER. Please wait..." + pw_kill_autostart VC_redist.x64.exe 3 & + pw_run "${PW_AUTOINSTALL_EXE}" + portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/1C Game Studios/Caliber/Launcher.exe" + try_remove_file "${PW_AUTOINSTALL_EXE}" + kill_portwine + pw_stop_progress_bar + export PORTWINE_CREATE_SHORTCUT_NAME="CALIBER" + portwine_create_shortcut +fi +stop_portwine diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index f05c45bf..9c031539 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -448,6 +448,11 @@ if [[ ! -z "$(echo ${1} | grep wgc_api.exe)" ]] && [[ ! -f "${1}" ]] ; then exit 0 fi +# HOTFIX CALIBRE +if [[ ! -z "$(echo ${1} | grep '/Caliber/')" ]] ; then + export PW_WINE_USE=PROTON_STEAM_6.3-8 +fi + PW_PREFIX_NAME="$(echo "${PW_PREFIX_NAME}" | sed -e s/[[:blank:]]/_/g)" PW_ALL_PREFIXES=$(ls "${PORT_WINE_PATH}/data/prefixes/" | sed -e s/"${PW_PREFIX_NAME}$"//g) export PW_PREFIX_NAME PW_ALL_PREFIXES @@ -667,6 +672,7 @@ else --field=" League of Legends"!"$PW_GUI_ICON_PATH/lol.png"!"":"FBTN" '@bash -c "button_click PW_LOL"' \ --field=" Gameforge Client"!"$PW_GUI_ICON_PATH/gameforge.png"!"":"FBTN" '@bash -c "button_click PW_GAMEFORGE"' \ --field=" World of Sea Battle (BETA)"!"$PW_GUI_ICON_PATH/wosb.png"!"":"FBTN" '@bash -c "button_click PW_WOSB"' \ + --field=" CALIBER"!"$PW_GUI_ICON_PATH/caliber.png"!"":"FBTN" '@bash -c "button_click PW_CALIBER"' \ --field=" ITCH.IO"!"$PW_GUI_ICON_PATH/itch.png"!"":"FBTN" '@bash -c "button_click PW_ITCH"' & # --field=" Steam Client Launcher"!"$PW_GUI_ICON_PATH/steam.png"!"":"FBTN" '@bash -c "button_click PW_STEAM"' diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index b1f1eb4c..bac76b28 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/usr/bin/env bash #Author: Castro-Fidel (linux-gaming.ru) -#SCRIPTS_NEXT_VERSION=2137 +#SCRIPTS_NEXT_VERSION=2138 ######################################################################## export PW_MANGOHUD=0 export MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,gpu_color=2e9762,gpu_text=GPU,vram,vram_color=ad64c1,ram,ram_color=c26693,io_color=a491d3,frame_timing=1,frametime_color=00ff00,time,arch,wine,wine_color=eb5b5b,engine_color=eb5b5b,background_alpha=0.2,font_size=24,background_color=020202,text_color=ffffff,toggle_hud=Shift_R+F12,resolution,vkbasalt