forked from CastroFidel/PortWINE
Scripts version 2231
This commit is contained in:
Mikhail Tergoev
parent
f2ef4e19a5
commit
b9eccd4f1b
@ -2,6 +2,10 @@ You can help us in the development of the project on the website: https://linux-
|
||||
----------------------------------------
|
||||
Changelog:
|
||||
|
||||
###Scripts version 2231### Date: 24.11.2023 / Download update size: 200 megabytes
|
||||
* updated PROTON_LG to version 8-24
|
||||
* updated autoinstall: World of Sea Battle x64 (thanks Iglu47 and Cefeiko)
|
||||
|
||||
###Scripts version 2230### Date: 10.11.2023 / Download update size: 8 megabytes
|
||||
* minor update
|
||||
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
-----------------------------------------
|
||||
История изменений:
|
||||
|
||||
###Scripts version 2231### Дата: 24.11.2023 / Размер скачиваемого обновления: 8 мегабайт
|
||||
###Scripts version 2231### Дата: 24.11.2023 / Размер скачиваемого обновления: 200 мегабайт
|
||||
* обновлен PROTON_LG до версии 8-24
|
||||
* обновлён установщик World of Sea Battle x64 (спасибо @Iglu47 и Cefeiko)
|
||||
*
|
||||
* небольшие улучшения локализации (спасибо Boria138)
|
||||
|
||||
###Scripts version 2230### Дата: 10.11.2023 / Размер скачиваемого обновления: 8 мегабайт
|
||||
* подготовка к обновлению установoщика PortProton
|
||||
|
||||
@ -275,7 +275,7 @@ start_portwine () {
|
||||
fi
|
||||
fi
|
||||
|
||||
pw_update_pfx_cover_gui
|
||||
[[ "${START_FROM_STEAM}" != 1 ]] || pw_update_pfx_cover_gui
|
||||
|
||||
if [[ ! -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}" \
|
||||
|| ! -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/drive_c/windows \
|
||||
@ -602,14 +602,15 @@ start_portwine () {
|
||||
[[ -z "${LAUNCH_PARAMETERS}" ]] && export LAUNCH_PARAMETERS+=" -eac-nop-loaded "
|
||||
fi
|
||||
|
||||
sleep 1
|
||||
pw_stop_progress_bar &&
|
||||
pw_tray_icon &&
|
||||
sleep 0.5
|
||||
if [[ "${START_FROM_STEAM}" != 1 ]] ; then
|
||||
pw_stop_progress_bar &&
|
||||
pw_tray_icon &&
|
||||
|
||||
if [[ "${PW_CHECK_AUTOINSTAL}" != "1" ]] ; then
|
||||
pw_start_progress_bar_cover "${PW_GUI_ICON_PATH}/covers/pw_loading_cover.gif"
|
||||
if [[ "${PW_CHECK_AUTOINSTAL}" != "1" ]] && [[ "${START_FROM_STEAM}" != 1 ]] ; then
|
||||
pw_start_progress_bar_cover "${PW_GUI_ICON_PATH}/covers/pw_loading_cover.gif"
|
||||
fi
|
||||
fi
|
||||
|
||||
add_in_start_portwine
|
||||
|
||||
if [[ -f "${PATH_TO_GAME}/dxvk.conf" ]] ; then
|
||||
@ -672,7 +673,7 @@ fi
|
||||
[[ -z "${LANG}" ]] && export LANG=C
|
||||
|
||||
create_new_dir "${HOME}/.local/share/applications"
|
||||
if [[ ! -z "${PW_SILENT_RESTART}" ]] && [[ "${PW_SILENT_RESTART}" = 1 ]] ; then
|
||||
if [[ "${PW_SILENT_RESTART}" == 1 ]] || [[ "${START_FROM_STEAM}" == 1 ]] ; then
|
||||
export PW_GUI_DISABLED_CS=1
|
||||
unset PW_SILENT_RESTART
|
||||
else
|
||||
@ -725,6 +726,10 @@ create_new_dir "${PORT_WINE_TMP_PATH}"/mono
|
||||
export PW_VULKAN_DIR="${PORT_WINE_TMP_PATH}/VULKAN"
|
||||
create_new_dir "${PW_VULKAN_DIR}"
|
||||
|
||||
# TODO: for steam
|
||||
# export STEAM_SCRIPTS="${PORT_WINE_PATH}/steam_scripts"
|
||||
# create_new_dir "${STEAM_SCRIPTS}"
|
||||
|
||||
export VULKAN_API_DRIVER_VERSION="$(vulkaninfo 2>/dev/null | grep "api" | head -n 1 | awk '{print $3}')"
|
||||
export LSPCI_VGA="$(lspci -k | grep -E 'VGA|3D' | tr -d '\n')"
|
||||
|
||||
@ -743,7 +748,7 @@ export PW_GUI_ICON_PATH="${PORT_WINE_PATH}/data/img/gui"
|
||||
export install_ver=`cat "${PORT_WINE_TMP_PATH}/${portname}_ver" | head -n 1`
|
||||
export WINETRICKS_DOWNLOADER="curl"
|
||||
export USER_CONF="${PORT_WINE_PATH}/data/user.conf"
|
||||
check_user_conf
|
||||
check_user_conf
|
||||
|
||||
if [[ -z "${INSTALLING_PORT}" ]] ; then
|
||||
. "${USER_CONF}"
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#!/usr/bin/env bash
|
||||
# Author: linux-gaming.ru
|
||||
|
||||
export NO_AT_BRIDGE=1
|
||||
[[ "${START_FROM_STEAM}" == 1 ]] || export NO_AT_BRIDGE=1
|
||||
export pw_full_command_line=("$0" $*)
|
||||
MISSING_DESKTOP_FILE=0
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
#Author: Castro-Fidel (linux-gaming.ru)
|
||||
#SCRIPTS_NEXT_VERSION=2230
|
||||
#SCRIPTS_NEXT_VERSION=2231
|
||||
########################################################################
|
||||
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
|
||||
|
||||
@ -522,7 +522,7 @@ gui_vkBasalt () {
|
||||
|
||||
portwine_create_shortcut () {
|
||||
pw_create_gui_png
|
||||
name_desktop="${PORTPROTON_NAME}"
|
||||
export name_desktop="${PORTPROTON_NAME}"
|
||||
OUTPUT=$("${pw_yad}" --title="${inst_set}." --form --borders=3 \
|
||||
--window-icon "$PW_GUI_ICON_PATH/port_proton.png" \
|
||||
--image "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.png" \
|
||||
@ -540,12 +540,7 @@ portwine_create_shortcut () {
|
||||
|
||||
echo "[Desktop Entry]" > "${PORT_WINE_PATH}/${name_desktop}.desktop"
|
||||
echo "Name=${name_desktop}" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
|
||||
if [ -z "${PW_CHECK_AUTOINSTAL}" ]
|
||||
then echo "Exec=env "\"${PORT_SCRIPTS_PATH}/start.sh\" \"${portwine_exe}\" "" \
|
||||
>> "${PORT_WINE_PATH}/${name_desktop}.desktop"
|
||||
else echo "Exec=env "\"${PORT_SCRIPTS_PATH}/start.sh\" \"${portwine_exe}\" "" \
|
||||
>> "${PORT_WINE_PATH}/${name_desktop}.desktop"
|
||||
fi
|
||||
echo "Exec=env "\"${PORT_SCRIPTS_PATH}/start.sh\" \"${portwine_exe}\" "" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
|
||||
echo "Type=Application" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
|
||||
echo "Categories=Game" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
|
||||
echo "StartupNotify=true" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
|
||||
@ -553,6 +548,14 @@ portwine_create_shortcut () {
|
||||
echo "Icon="${PORT_WINE_PATH}/data/img/${name_desktop}.png"" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
|
||||
chmod u+x "${PORT_WINE_PATH}/${name_desktop}.desktop"
|
||||
|
||||
# TODO: for steam
|
||||
# echo "#!/usr/bin/env bash" > "${STEAM_SCRIPTS}/${name_desktop}.sh"
|
||||
# echo "export START_FROM_STEAM=1" >> "${STEAM_SCRIPTS}/${name_desktop}.sh"
|
||||
# echo "export LD_PRELOAD=\"\"" >> "${STEAM_SCRIPTS}/${name_desktop}.sh"
|
||||
# echo "\"${PORT_SCRIPTS_PATH}/start.sh\" \"${portwine_exe}\" " >> "${STEAM_SCRIPTS}/${name_desktop}.sh"
|
||||
# chmod u+x "${STEAM_SCRIPTS}/${name_desktop}.sh"
|
||||
# "${PORT_SCRIPTS_PATH}/add_in_steam.sh"
|
||||
|
||||
if [[ "${create_menu_desktop_shortcut}" == "TRUE" ]]; then
|
||||
try_remove_file "${HOME}/.local/share/applications/${name_desktop}.desktop"
|
||||
cp -f "${PORT_WINE_PATH}/${name_desktop}.desktop" "${HOME}/.local/share/applications/"
|
||||
@ -571,6 +574,7 @@ portwine_create_shortcut () {
|
||||
portwine_delete_shortcut () {
|
||||
rm -f "$(grep -il "${portwine_exe}" "${HOME}/.local/share/applications"/*.desktop)" $>/dev/null
|
||||
rm -f "$(grep -il "${portwine_exe}" "${PORT_WINE_PATH}"/*.desktop)" $>/dev/null
|
||||
rm -f "$(grep -il "${portwine_exe}" "${STEAM_SCRIPTS}"/*.sh)" $>/dev/null
|
||||
if [[ -d "${HOME}/Desktop" ]] ; then
|
||||
rm -f "$(grep -il "${portwine_exe}" "${HOME}/Desktop"/*.desktop)" $>/dev/null
|
||||
elif [[ -d "${HOME}/Рабочий стол" ]] ; then
|
||||
|
||||
Loading…
Reference in New Issue
Block a user