Skip to content

P
PortWINE-old
Commit 3ebfdbab authored by Mikhail Tergoev's avatar Mikhail Tergoev
Browse files
Options

###Scripts version 1076###

parent 3cab2af0
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 32 deletions
data_from_portwine/changelog
View file @ 3ebfdbab
...@@ -15,6 +15,14 @@ ...@@ -15,6 +15,14 @@
* добавить контроль за окнами для правильного отключения прогресс бара * добавить контроль за окнами для правильного отключения прогресс бара
* зарабатывать на жизнь развитием проекта с помощью вашей подписки на https://boosty.to/portwine-linux.ru * зарабатывать на жизнь развитием проекта с помощью вашей подписки на https://boosty.to/portwine-linux.ru
----------------------------------------- -----------------------------------------
###PortProton-80### 18.05.2021 ###Scripts version 1076###
* при любом использовании winetricks добавлен аргумент -r (для автоматического перекачивания библиотек, если хеш-суммы не совпадают)
* winetricks запущенный с GUI работает без контейнерного режима
* временно глобально отклчени gamemode в скрипте var (необходим тест)
* начальная адаптация скриптов под контейнерный режим запуска wine
* libs_v11 обновлен и переведен полностью на контейнерный режим запуска
* в PortProton.desktop изменен аргумент с %U на %F
###PortProton-80### 11.05.2021 ###Scripts version 1075### ###PortProton-80### 11.05.2021 ###Scripts version 1075###
* обновлен WINE до версии Proton 6.8 GE 1 * обновлен WINE до версии Proton 6.8 GE 1
* обновлена инициализация и настройка префикса под новые версии Proton GE * обновлена инициализация и настройка префикса под новые версии Proton GE
......
data_from_portwine/scripts/portwine_db/Medal Of Honor -Allied Assault deleted 100644 → 0
View file @ 3cab2af0
#!/bin/bash
#Author: Ridbowt (Nikola P.)
#MOHAA.exe
#moh_spearhead.exe
#moh_breakthrough.exe
#Rating=5
################################################
export PW_VULKAN_USE=0
export LAUNCH_PARAMETERS=""
export MESA_EXTENSION_MAX_YEAR=2002
data_from_portwine/scripts/runlib
View file @ 3ebfdbab
...@@ -172,16 +172,14 @@ PW_LOAD_LIBS () { ...@@ -172,16 +172,14 @@ PW_LOAD_LIBS () {
--no-wrap ` > /dev/null 2>&1 && PW_LOAD_LIBS --no-wrap ` > /dev/null 2>&1 && PW_LOAD_LIBS
fi fi
fi fi
try_remove_dir "${WINELIB}/pinned_libs_32" export pw_yad="${WINELIB}/runtime/bin/yad"
try_remove_dir "${WINELIB}/pinned_libs_64" export pw_zstd="${WINELIB}/runtime/bin/zstd"
export pw_yad="${WINELIB}/usr/bin/yad" export pw_7z="${WINELIB}/runtime/lib/p7zip/7zr"
export pw_zstd="${WINELIB}/usr/bin/zstd"
export pw_7z="${WINELIB}/usr/lib/p7zip/7zr"
if [ -x "`which xterm 2>/dev/null`" ]; then if [ -x "`which xterm 2>/dev/null`" ]; then
export SYS_XTERM=`which xterm` export SYS_XTERM=`which xterm`
export PW_XTERM="${SYS_XTERM} -geometry 159x37 -e" export PW_XTERM="${SYS_XTERM} -geometry 159x37 -e"
else else
export PW_XTERM="${WINELIB}/amd64/usr/bin/xterm -geometry 159x37 -e" export PW_XTERM="${WINELIB}/runtime/bin/xterm -geometry 159x37 -e"
fi fi
} }
...@@ -511,7 +509,7 @@ RUN_WINETRICKS_FROM_DB () { ...@@ -511,7 +509,7 @@ RUN_WINETRICKS_FROM_DB () {
UPDATE_WINETRICKS UPDATE_WINETRICKS
PW_STOP_PROGRESS_BAR PW_STOP_PROGRESS_BAR
print_info "Need to install DLL in prefix: ${PW_DLL_NEED_INSTALL}" print_info "Need to install DLL in prefix: ${PW_DLL_NEED_INSTALL}"
${PW_TERM} "${PW_RUNTIME}" "${PORT_WINE_TMP_PATH}/winetricks" -q --force ${PW_DLL_NEED_INSTALL} ${PW_TERM} ${PW_RUNTIME} "${PORT_WINE_TMP_PATH}/winetricks" -q -r --force ${PW_DLL_NEED_INSTALL}
fi fi
PW_START_PROGRESS_BAR_CS "Start ${portname}... Please wait..." PW_START_PROGRESS_BAR_CS "Start ${portname}... Please wait..."
fi fi
...@@ -519,7 +517,7 @@ RUN_WINETRICKS_FROM_DB () { ...@@ -519,7 +517,7 @@ RUN_WINETRICKS_FROM_DB () {
if [ ! -z "${PW_WINDOWS_VER}" ] && [ `echo "$PW_WINDOWS_VER" | sed 's/.*/\L&/'` == "xp" ] ; then if [ ! -z "${PW_WINDOWS_VER}" ] && [ `echo "$PW_WINDOWS_VER" | sed 's/.*/\L&/'` == "xp" ] ; then
export PW_WINDOWS_VER="xp64" export PW_WINDOWS_VER="xp64"
fi fi
"${PW_RUNTIME}" "${WINELOADER}" winecfg -v `echo "win${PW_WINDOWS_VER}" | sed 's/.*/\L&/'` ${PW_RUNTIME} "${WINELOADER}" winecfg -v `echo "win${PW_WINDOWS_VER}" | sed 's/.*/\L&/'`
echo "Set to win${PW_WINDOWS_VER}" echo "Set to win${PW_WINDOWS_VER}"
fi fi
} }
...@@ -626,7 +624,7 @@ PW_INIT_PFX () { ...@@ -626,7 +624,7 @@ PW_INIT_PFX () {
PW_STOP_PROGRESS_BAR PW_STOP_PROGRESS_BAR
PW_START_PROGRESS_BAR_BLOCK "Updating prefix... Please wait..." PW_START_PROGRESS_BAR_BLOCK "Updating prefix... Please wait..."
KILL_PORTWINE KILL_PORTWINE
"${PW_RUNTIME}" "${WINELOADER}" wineboot -u ${PW_RUNTIME} "${WINELOADER}" wineboot -u
WAIT_WINESERVER WAIT_WINESERVER
KILL_PORTWINE KILL_PORTWINE
PW_STOP_PROGRESS_BAR PW_STOP_PROGRESS_BAR
...@@ -759,20 +757,20 @@ PW_RUN () { ...@@ -759,20 +757,20 @@ PW_RUN () {
export PW_TERM="" export PW_TERM=""
export PW_LOG_TO_FILE="${PORT_WINE_PATH}/${portname}.log" export PW_LOG_TO_FILE="${PORT_WINE_PATH}/${portname}.log"
if [ ! -z "${PW_GAMEMODERUN}" ] && [ "${PW_GAMEMODERUN}" != 0 ] ; then if [ ! -z "${PW_GAMEMODERUN}" ] && [ "${PW_GAMEMODERUN}" != 0 ] ; then
echo "Full command line: $PW_TERM ${optirun_on} "${PW_RUNTIME}" gamemoderun ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}" "&>>${PW_LOG_TO_FILE}" echo "Full command line: $PW_TERM ${optirun_on} ${PW_RUNTIME} gamemoderun ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}" "&>>${PW_LOG_TO_FILE}"
$PW_TERM ${optirun_on} "${PW_RUNTIME}" gamemoderun ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]} &>>"${PW_LOG_TO_FILE}" $PW_TERM ${optirun_on} ${PW_RUNTIME} gamemoderun ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]} &>>"${PW_LOG_TO_FILE}"
else else
echo "Full command line: $PW_TERM ${optirun_on} "${PW_RUNTIME}" ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}" "&>>${PW_LOG_TO_FILE}" echo "Full command line: $PW_TERM ${optirun_on} ${PW_RUNTIME} ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}" "&>>${PW_LOG_TO_FILE}"
$PW_TERM ${optirun_on} "${PW_RUNTIME}" ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]} &>>"${PW_LOG_TO_FILE}" $PW_TERM ${optirun_on} ${PW_RUNTIME} ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]} &>>"${PW_LOG_TO_FILE}"
fi fi
else else
[ "${PW_USE_TERMINAL}" != "1" ] && export PW_TERM="" [ "${PW_USE_TERMINAL}" != "1" ] && export PW_TERM=""
if [ ! -z "${PW_GAMEMODERUN}" ] && [ "${PW_GAMEMODERUN}" != 0 ] ; then if [ ! -z "${PW_GAMEMODERUN}" ] && [ "${PW_GAMEMODERUN}" != 0 ] ; then
echo "Full command line: $PW_TERM ${optirun_on} "${PW_RUNTIME}" gamemoderun ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}" echo "Full command line: $PW_TERM ${optirun_on} ${PW_RUNTIME} gamemoderun ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}"
$PW_TERM ${optirun_on} "${PW_RUNTIME}" gamemoderun ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]} $PW_TERM ${optirun_on} ${PW_RUNTIME} gamemoderun ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}
else else
echo "Full command line: $PW_TERM ${optirun_on} "${PW_RUNTIME}" ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}" echo "Full command line: $PW_TERM ${optirun_on} ${PW_RUNTIME} ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}"
$PW_TERM ${optirun_on} "${PW_RUNTIME}" ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]} $PW_TERM ${optirun_on} ${PW_RUNTIME} ${RUN_MANGOHUD} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[*]}
fi fi
fi fi
} }
...@@ -805,7 +803,7 @@ export WINELIB="${HOME}/.PortWINE/libs${pw_libs_ver}" ...@@ -805,7 +803,7 @@ export WINELIB="${HOME}/.PortWINE/libs${pw_libs_ver}"
export WINEPREFIX="${PORT_WINE_PATH}/data/pfx" export WINEPREFIX="${PORT_WINE_PATH}/data/pfx"
export PW_COMPAT_MEDIA_PATH="${PORT_WINE_TMP_PATH}" export PW_COMPAT_MEDIA_PATH="${PORT_WINE_TMP_PATH}"
export WINE_WIN_START="${WINEPREFIX}/drive_c/windows/system32/start.exe" export WINE_WIN_START="${WINEPREFIX}/drive_c/windows/system32/start.exe"
export PW_RUNTIME="$WINELIB/run.sh" export PW_RUNTIME="${WINELIB}/run-in-soldier --remove-game-overlay --share-home --runtime=runtime --"
export PW_GUI_ICON_PATH="${PORT_WINE_PATH}/data/img/gui" export PW_GUI_ICON_PATH="${PORT_WINE_PATH}/data/img/gui"
export PW_VULKAN_DLL="${HOME}/.PortWINE/vulkan" export PW_VULKAN_DLL="${HOME}/.PortWINE/vulkan"
export PW_DXVK_VER="${PW_DEF_DXVK_VER}" export PW_DXVK_VER="${PW_DEF_DXVK_VER}"
......
data_from_portwine/scripts/setup.sh
View file @ 3ebfdbab
...@@ -20,8 +20,9 @@ create_new_dir "/home/${USER}/.local/share/applications" ...@@ -20,8 +20,9 @@ create_new_dir "/home/${USER}/.local/share/applications"
name_desktop="PortProton" name_desktop="PortProton"
echo "[Desktop Entry]" > "${PORT_WINE_PATH}/${name_desktop}.desktop" echo "[Desktop Entry]" > "${PORT_WINE_PATH}/${name_desktop}.desktop"
echo "Name=${name_desktop}" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" echo "Name=${name_desktop}" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
echo "Exec=env "${PORT_SCRIPTS_PATH}/start.sh %U"" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" echo "Exec=env "${PORT_SCRIPTS_PATH}/start.sh %F"" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
echo "Type=Application" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" echo "Type=Application" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
echo "Terminal=False" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
echo "Categories=Game" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" echo "Categories=Game" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
echo "StartupNotify=true" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" echo "StartupNotify=true" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
echo "MimeType=application/x-ms-dos-executable;application/x-wine-extension-msp;application/x-msi;application/x-msdos-program" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" echo "MimeType=application/x-ms-dos-executable;application/x-wine-extension-msp;application/x-msi;application/x-msdos-program" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
......
data_from_portwine/scripts/start.sh
View file @ 3ebfdbab
...@@ -187,7 +187,7 @@ PW_WINETRICKS () { ...@@ -187,7 +187,7 @@ PW_WINETRICKS () {
UPDATE_WINETRICKS UPDATE_WINETRICKS
export PW_USE_TERMINAL=1 export PW_USE_TERMINAL=1
START_PORTWINE START_PORTWINE
$PW_TERM "${PW_RUNTIME}" "${PORT_WINE_TMP_PATH}/winetricks" -q --force "${PORT_WINE_TMP_PATH}/winetricks" -qr --force
} }
PW_EDIT_DB () { PW_EDIT_DB () {
xdg-open "${PORTWINE_DB_FILE}" xdg-open "${PORTWINE_DB_FILE}"
......
data_from_portwine/scripts/var
View file @ 3ebfdbab
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#export DXVK_HUD=fps,devinfo #export DXVK_HUD=fps,devinfo
#export PW_VIRTUAL_DESKTOP=1 #export PW_VIRTUAL_DESKTOP=1
export PW_FORCE_DISABLED_GAMEMOD=0 export PW_FORCE_DISABLED_GAMEMOD=1
export PW_DEF_DXVK_VER=1.8.1 export PW_DEF_DXVK_VER=1.8.1
export PW_DEF_VKD3D_VER=2.3.1 export PW_DEF_VKD3D_VER=2.3.1
...@@ -23,7 +23,7 @@ export WINEARCH="win64" ...@@ -23,7 +23,7 @@ export WINEARCH="win64"
export mono_ver=6.1.2 export mono_ver=6.1.2
export gecko_ver=2.47.2 export gecko_ver=2.47.2
export pw_libs_ver="_v10" export pw_libs_ver="_v11"
export PW_FORCE_LARGE_ADDRESS_AWARE=1 export PW_FORCE_LARGE_ADDRESS_AWARE=1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment