diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 381af9da..51bdc5dc 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 2142### +* due to EA Launcher issues, the Origin installer has been temporarily reverted + ###Scripts version 2142### * added alternative FTP server for PP component updates if download failed from main GITHUB server * added display of current versions of DXVK and VKD3D when they are selected in the PortProton interface diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 6bdfa7eb..7cf43763 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,9 @@ ----------------------------------------- История изменений: +###Scripts version 2142### +* из за проблем связанных с EA Launcher, временно возвращен установщик Origin + ###Scripts version 2142### * добавлен альтернативный FTP сервер для обновлений компонентов PP если не удалось скачать с основного сервера GITHUB * добавлен вывод текущих версий DXVK и VKD3D при их выборе в интерфейсе PortProton diff --git a/data_from_portwine/img/gui/plariumplay.png~ b/data_from_portwine/img/gui/plariumplay.png~ deleted file mode 100644 index 4ef3146e..00000000 Binary files a/data_from_portwine/img/gui/plariumplay.png~ and /dev/null differ diff --git a/data_from_portwine/scripts/portwine_db/Origin b/data_from_portwine/scripts/portwine_db/Origin index f6eb4d28..e9fdc27e 100755 --- a/data_from_portwine/scripts/portwine_db/Origin +++ b/data_from_portwine/scripts/portwine_db/Origin @@ -1,42 +1,27 @@ #!/usr/bin/env bash #Author: PortWINE #Origin.exe -#Rating=5 +#Rating=? #####################examples########################### -export PW_DLL_INSTALL="vcrun2019" # Install DDL in port prefix (used winetricks) +export PW_DLL_INSTALL="vcrun2012 vcrun2019" # Install DDL in port prefix (used winetricks) export PW_VULKAN_USE=1 # dxvk, vkd3d or 0 for OpenGL -# export PW_USE_TERMINAL="1" -export PW_WINE_TKG_VER="7.20" -export PW_WINE_USE="WINE-${PW_WINE_TKG_VER}-STAGING-TKG-AMD64" -export PW_MUST_HAVE_DLL="" -export PW_PREFIX_NAME="EA_APP" -# export WINEDLLOVERRIDES="mscoree,mshtml=" +export PW_USE_TERMINAL="1" -check_download_wine_ver_for_ea () { - if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ] ; then - if try_download "https://github.com/Kron4ek/Wine-Builds/releases/download/${PW_WINE_TKG_VER}/wine-${PW_WINE_TKG_VER}-staging-tkg-amd64.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 -} -check_download_wine_ver_for_ea - -if [[ -d "${PORT_WINE_PATH}/data/dist" ]] ; then - orig_IFS="$IFS" - IFS=$'\n' - for dist_dir in $(ls -1 "${PORT_WINE_PATH}/data/dist/") ; do - dist_dir_new=`echo "${dist_dir}" | awk '$1=$1' | sed -e s/[[:blank:]]/_/g` - if [[ ! -d "${PORT_WINE_PATH}/data/dist/${dist_dir_new^^}" ]] ; then - mv -- "${PORT_WINE_PATH}/data/dist/$dist_dir" "${PORT_WINE_PATH}/data/dist/${dist_dir_new^^}" - fi - done - IFS="$orig_IFS" -fi +###WINE_KRON4EK### +# export PW_WINE_USE="WINE-7.13-STAGING-AMD64" +# check_download_wine_ver_for_origin () { +# if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ] ; then +# if try_download "https://github.com/Kron4ek/Wine-Builds/releases/download/7.13/wine-7.13-staging-amd64.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 +# } +# check_download_wine_ver_for_origin diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ORIGIN b/data_from_portwine/scripts/pw_autoinstall/PW_ORIGIN new file mode 100755 index 00000000..5df45c4b --- /dev/null +++ b/data_from_portwine/scripts/pw_autoinstall/PW_ORIGIN @@ -0,0 +1,18 @@ +#!/usr/bin/env bash +# Author: Castro-Fidel (linux-gaming.ru) +######################################################################## +export LAUNCH_PARAMETERS=("/silent" "/NoLaunch" ) +export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/OriginSetup.exe" +start_portwine +if try_download "origin-a.akamaihd.net/Origin-Client-Download/origin/live/OriginThinSetup.exe" "${PW_AUTOINSTALL_EXE}" +then + pw_start_progress_bar_block "${loc_gui_installing_the} Origin. ${loc_gui_please_wait}" + # pw_kill_autostart Origin.exe & + pw_run "${PW_AUTOINSTALL_EXE}" + portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Origin/Origin.exe" + pw_stop_progress_bar + try_remove_file "${PW_AUTOINSTALL_EXE}" + kill_portwine + portwine_create_shortcut +fi +stop_portwine diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index a315cad2..345a957a 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -690,7 +690,7 @@ else --field=" Ubisoft Game Launcher"!"$PW_GUI_ICON_PATH/ubc.png"!"":"FBTN" '@bash -c "button_click PW_UBC"' \ --field=" EVE Online Launcher"!"$PW_GUI_ICON_PATH/eve.png"!"":"FBTN" '@bash -c "button_click PW_EVE"' \ --field=" Lesta Game Center"!"$PW_GUI_ICON_PATH/lgc.png"!"":"FBTN" '@bash -c "button_click PW_LGC"' \ - --field=" EA Launcher (Origin)"!"$PW_GUI_ICON_PATH/eaapp.png"!"":"FBTN" '@bash -c "button_click PW_EAAPP"' \ + --field=" Origin"!"$PW_GUI_ICON_PATH/origin.png"!"":"FBTN" '@bash -c "button_click PW_ORIGIN"' \ --field=" Rockstar Games Launcher"!"$PW_GUI_ICON_PATH/Rockstar.png"!"":"FBTN" '@bash -c "button_click PW_ROCKSTAR"' \ --field=" vkPlay Games Center"!"$PW_GUI_ICON_PATH/mygames.png"!"":"FBTN" '@bash -c "button_click PW_VKPLAY"' \ --field=" Ankama Launcher"!"$PW_GUI_ICON_PATH/ankama.png"!"":"FBTN" '@bash -c "button_click PW_ANKAMA"' \ diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index d77cd2dd..493d798c 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=2142 +#SCRIPTS_NEXT_VERSION=2143 ######################################################################## 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