diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 60ab7a3a..03a42423 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,10 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2264### Date: 15.03.2024 / Download update size: 15 megabytes +* added the option to end the first PortProton session when starting the second +* added auto-installation of the game "Pulse Online" + ###Scripts version 2263### Date: 15.03.2024 / Download update size: 15 megabytes * the lock file of the second session has been moved to "/tmp/portproton.lock" * when starting from the terminal, it is clearly indicated that the lock file and its location have been found diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index e040c7fe..f8e76bb2 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,10 @@ ----------------------------------------- История изменений: +###Scripts version 2264### Дата: 15.03.2024 / Размер скачиваемого обновления: 15 мегабайт +* добавлен выбор завершения первой сессии PortProton при запуске второй +* добавлена автоустановка игры "Pulse Online" + ###Scripts version 2263### Дата: 15.03.2024 / Размер скачиваемого обновления: 15 мегабайт * файл блокировки второй сессии перенесен в "/tmp/portproton.lock" * при запуске с терминала, явно указано что найден файл блокировки и его месторасположение diff --git a/data_from_portwine/img/gui/pulseonline.png b/data_from_portwine/img/gui/pulseonline.png new file mode 100644 index 00000000..5225ca03 Binary files /dev/null and b/data_from_portwine/img/gui/pulseonline.png differ diff --git a/data_from_portwine/scripts/credits b/data_from_portwine/scripts/credits index 3f7425c6..afc22d38 100755 --- a/data_from_portwine/scripts/credits +++ b/data_from_portwine/scripts/credits @@ -364,7 +364,8 @@ YAD: https://github.com/v1cont/yad" 2>/dev/null & --tab="О PORTPROTON" --tab="АВТОРЫ" --tab="ЛИЦЕНЗИЯ" --tab="СПОНСОРЫ" --tab="ПРИСОЕДИНИТЬСЯ" \ --tab="БИБЛИОТЕКИ" echo "Exit from credits" - /usr/bin/env bash -c ${pw_full_command_line[*]} + /usr/bin/env bash -c ${pw_full_command_line[*]} & + exit 0 else @@ -733,5 +734,6 @@ YAD: https://github.com/v1cont/yad" 2>/dev/null & --tab="THIRD PARTY LIBRARIES" echo "Exit from credits" - /usr/bin/env bash -c ${pw_full_command_line[*]} + /usr/bin/env bash -c ${pw_full_command_line[*]} & + exit 0 fi diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang index e274e506..ba073687 100755 --- a/data_from_portwine/scripts/lang +++ b/data_from_portwine/scripts/lang @@ -128,7 +128,7 @@ if [[ "${update_loc}" == "RUS" ]] ; then export loc_gui_dll_new_pfx="Установить рекомендованные библиотеки в новый префикс: " - export loc_gui_portproton_lock='Завершите предыдущую сессию PortProton перед запуском новой,\nили воспользуйтесь ПКМ на значке в трее -> Завершить работу PortProton.' + export loc_gui_portproton_lock='Обнаружена запущенная сессия PortProton.\nХотите завершить предыдущую сессию?' export ENABLE_VKBASALT_INFO='Включить vkBasalt по умолчанию для улучшение графики в играх работающих под Vulkan. (Горячая клавиша HOME отключает vkbasalt)' export PW_NO_ESYNC_INFO='Не использовать примитивы внутрипроцессной синхронизации на основе eventfd. (Рекомендуется не изменять значение)' @@ -539,7 +539,7 @@ elif [[ "${update_loc}" == "ENG" ]] ; then export loc_gui_dll_new_pfx="Do you want to installing recommended libraries in the new prefix: " - export loc_gui_portproton_lock='End the previous PortProton session before starting a new one,\nor use the RMB on the tray icon -> Shut down PortProton.' + export loc_gui_portproton_lock='A running PortProton session was detected.\nDo you want to end the previous session?' export ENABLE_VKBASALT_INFO='Enable vkBasalt by default to improve graphics in games running on Vulkan. (The HOME hotkey disables vkbasalt)' export PW_NO_ESYNC_INFO='Do not use in-process synchronization primitives based on eventfd. (It is recommended not to change the value.)' diff --git a/data_from_portwine/scripts/portwine_db/PulseOnlineLauncher b/data_from_portwine/scripts/portwine_db/PulseOnlineLauncher new file mode 100644 index 00000000..4a8d45a4 --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/PulseOnlineLauncher @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +#Author: fidel +#PulseOnlineLauncher.exe +#Rating=5 +#####################examples########################### +export PW_VULKAN_USE="2" +export PW_WINE_USE="PROTON_LG" +export PW_PREFIX_NAME="DOTNET" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_PULSE_ONLINE b/data_from_portwine/scripts/pw_autoinstall/PW_PULSE_ONLINE new file mode 100755 index 00000000..0cd7cf7d --- /dev/null +++ b/data_from_portwine/scripts/pw_autoinstall/PW_PULSE_ONLINE @@ -0,0 +1,21 @@ +#!/usr/bin/env bash +# Author: cefeiko +######################################################################## +export PW_PREFIX_NAME=DOTNET +export PORTWINE_CREATE_SHORTCUT_NAME="Pulse Online" + +start_portwine + +mkdir -p "${WINEPREFIX}/drive_c/games/PulseOnline/" +export PW_AUTOINSTALL_EXE="${WINEPREFIX}/drive_c/games/PulseOnline/PulseOnlineLauncher.exe" + +if try_download_no_mirror "https://pulseonline.ru/game_download/PulseOnlineLauncher.exe" "${PW_AUTOINSTALL_EXE}" +then + export portwine_exe="$PW_AUTOINSTALL_EXE" + try_remove_file "${portwine_exe}.ppdb" + pw_stop_progress_bar + portwine_create_shortcut + kill_portwine +fi + +stop_portwine diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index a1af99e5..22ed8b5c 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -867,8 +867,7 @@ check_variables PW_LOG "0" if [[ -z "${INSTALLING_PORT}" ]] ; then if [[ -f "/tmp/portproton.lock" ]] ; then print_warning "Found lock file: /tmp/portproton.lock" - yad_info "$loc_gui_portproton_lock" - exit 0 + yad_question "$loc_gui_portproton_lock" || exit 0 fi touch "/tmp/portproton.lock" rm_lock_file () { diff --git a/data_from_portwine/scripts/setup.sh b/data_from_portwine/scripts/setup.sh index e85e5339..6096e171 100755 --- a/data_from_portwine/scripts/setup.sh +++ b/data_from_portwine/scripts/setup.sh @@ -31,7 +31,9 @@ else chmod u+x "${PORT_WINE_PATH}/${name_desktop}.desktop" fi -if [[ ! -f /usr/bin/portproton ]] ; then +if [[ ! -f /usr/bin/portproton ]] \ +&& ! grep -i "flatpak" /etc/os-release &>/dev/null +then cp -f "${PORT_WINE_PATH}/${name_desktop}.desktop" ${HOME}/.local/share/applications/ fi diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 1076a4ca..61c65d95 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -385,7 +385,8 @@ pw_prefix_manager () { else print_info "Nothing to do. Restarting PortProton..." stop_portwine & - /usr/bin/env bash -c ${pw_full_command_line[*]} + /usr/bin/env bash -c ${pw_full_command_line[*]} & + exit 0 fi } gui_prefix_manager @@ -852,7 +853,8 @@ else --field=" Genshin Impact"!"$PW_GUI_ICON_PATH/genshinimpact.png"!"":"FBTN" '@bash -c "button_click PW_GENSHIN_IMPACT"' \ --field=" EA App (TEST)"!"$PW_GUI_ICON_PATH/eaapp.png"!"":"FBTN" '@bash -c "button_click PW_EAAPP"' \ --field=" Battle Of Space Raiders"!"$PW_GUI_ICON_PATH/bsr.png"!"":"FBTN" '@bash -c "button_click PW_BSR"' \ - --field=" Black Desert Online (RU)"!"$PW_GUI_ICON_PATH/bdo.png"!"":"FBTN" '@bash -c "button_click PW_BDO"' 2>/dev/null & + --field=" Black Desert Online (RU)"!"$PW_GUI_ICON_PATH/bdo.png"!"":"FBTN" '@bash -c "button_click PW_BDO"' \ + --field=" Pulse Online"!"$PW_GUI_ICON_PATH/pulseonline.png"!"":"FBTN" '@bash -c "button_click PW_PULSE_ONLINE"' 2>/dev/null & # --field=" Secret World Legends (ENG)"!"$PW_GUI_ICON_PATH/swl.png"!"":"FBTN" '@bash -c "button_click PW_SWL"' # --field=" Bethesda.net Launcher"!"$PW_GUI_ICON_PATH/bethesda.png"!"":"FBTN" '@bash -c "button_click PW_BETHESDA"' diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 2afe5208..0e8db9a3 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=2263 +#SCRIPTS_NEXT_VERSION=2264 ######################################################################## export PW_MANGOHUD="0" export DEFAULT_MANGOHUD_CONFIG="cpu_stats,cpu_temp,cpu_mhz,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,vram,ram,frame_timing=1,time,arch,wine,toggle_hud=Shift_R+F12,resolution,vkbasalt,gamemode" diff --git a/data_from_portwine/scripts/yad_gui b/data_from_portwine/scripts/yad_gui index 1a67902d..1bf9ce60 100755 --- a/data_from_portwine/scripts/yad_gui +++ b/data_from_portwine/scripts/yad_gui @@ -674,7 +674,6 @@ gui_MangoHud () { exit 0 } - portwine_create_shortcut () { pw_create_gui_png pw_stop_progress_bar