Commit 7021c035 authored by Mikhail Tergoev's avatar Mikhail Tergoev

###Scripts version 1087###

parent 72329c24
...@@ -15,7 +15,32 @@ ...@@ -15,7 +15,32 @@
* добавить контроль за окнами для правильного отключения прогресс бара * добавить контроль за окнами для правильного отключения прогресс бара
* зарабатывать на жизнь развитием проекта с помощью вашей подписки на https://boosty.to/portwine-linux.ru * зарабатывать на жизнь развитием проекта с помощью вашей подписки на https://boosty.to/portwine-linux.ru
----------------------------------------- -----------------------------------------
###Scripts version 1080### ###Scripts version 1087###
* добавлен вопрос об обновлении скриптов
* HOTFIX - полностью убрана переменная WINE_WIN_START
###Scripts version 1086###
* HOTFIX - изменена переменная export WINE_WIN_START="start.exe /b"
###Scripts version 1085###
* в скрипт var добавлена и временно включена переменная export PW_FORCE_DISABLED_RUNTIME=1 (требуется рашение проблемы с загрузкой faudio)
* добавлено автоматическое создание каталога "${WINEPREFIX}/drive_c/users/Public/Documents/Steam"
* HOTFIX - обновление скриптов после установки происходило только при повторном запуске порта
###Scripts version 1084###
* фикc запуска gui winetricks c терминалом
###Scripts version 1083###
* временно вернул работу winetricks без использования контейнера
###Scripts version 1082###
* HOTFIX - смена версии cabextract внутри libs_v14
###Scripts version 1081###
* HOTFIX - автоматичкское удаление wget из libs_v14, что бы winetricks использовал curl для скачивания
###PortProton-80### 19.05.2021 ###Scripts version 1080###
* обновлен WINE до версии Proton 6.8 GE 1
* обновлен контейнер в libs_v14 до версии Debian 10.9 * обновлен контейнер в libs_v14 до версии Debian 10.9
* добавлен аргумент запуска RUNTIME "--filesystem=${PORT_WINE_PATH}" для возможности установки и использования порта вне $HOME * добавлен аргумент запуска RUNTIME "--filesystem=${PORT_WINE_PATH}" для возможности установки и использования порта вне $HOME
* перенос создания символьной ссылки на drive_c из скрипта setup в runlib * перенос создания символьной ссылки на drive_c из скрипта setup в runlib
......
...@@ -29,6 +29,13 @@ then ...@@ -29,6 +29,13 @@ then
export port_upd5="Напомнить позже" export port_upd5="Напомнить позже"
export port_upd6="Больше не напоминать" export port_upd6="Больше не напоминать"
export scripts_upd1="Обновление скриптов"
export scripts_upd2="Доступно обновление скриптов для ${portname}\n"
export scripts_upd3="Действие:"
export scripts_upd4="Обновить сейчас"
export scripts_upd5="Напомнить позже"
export scripts_upd6="Больше не напоминать"
export port_del1="Удаление $portname" export port_del1="Удаление $portname"
export port_del2="Вы действительно хотите удалить $portname,\nс установленным в него клиентом?\n" export port_del2="Вы действительно хотите удалить $portname,\nс установленным в него клиентом?\n"
export port_del3="Удалить?!" export port_del3="Удалить?!"
...@@ -116,6 +123,13 @@ then ...@@ -116,6 +123,13 @@ then
export port_upd5="Remind me later" export port_upd5="Remind me later"
export port_upd6="Do not remind me" export port_upd6="Do not remind me"
export scripts_upd1="New update for scripts"
export scripts_upd2="Scripts update avialable for ${portname}\n"
export scripts_upd3="Action:"
export scripts_upd4="Updating now"
export scripts_upd5="Remind me later"
export scripts_upd6="Do not remind me"
export port_del1="Remove $portname" export port_del1="Remove $portname"
export port_del2="Are you sure you want to delete the ${portname}?\n" export port_del2="Are you sure you want to delete the ${portname}?\n"
export port_del3="Remove?!" export port_del3="Remove?!"
......
...@@ -63,3 +63,5 @@ else ...@@ -63,3 +63,5 @@ else
`zenity --info --title "${inst_set_top}" --text "${inst_succ}" --no-wrap ` > /dev/null 2>&1 `zenity --info --title "${inst_set_top}" --text "${inst_succ}" --no-wrap ` > /dev/null 2>&1
xdg-open "http://portwine-linux.ru/portwine-faq/" > /dev/null 2>&1 & exit 0 xdg-open "http://portwine-linux.ru/portwine-faq/" > /dev/null 2>&1 & exit 0
fi fi
unset INSTALLING_PORT
\ No newline at end of file
...@@ -13,13 +13,13 @@ PORTWINE_LAUNCH () { ...@@ -13,13 +13,13 @@ PORTWINE_LAUNCH () {
PORTWINE_BAT=`basename "${portwine_exe}" | grep .bat` PORTWINE_BAT=`basename "${portwine_exe}" | grep .bat`
if [ ! -z "${PW_VIRTUAL_DESKTOP}" ] && [ "${PW_VIRTUAL_DESKTOP}" == "1" ] ; then if [ ! -z "${PW_VIRTUAL_DESKTOP}" ] && [ "${PW_VIRTUAL_DESKTOP}" == "1" ] ; then
pw_screen_resolution=`xrandr --current | grep "*" | awk '{print $1;}' | head -1` pw_screen_resolution=`xrandr --current | grep "*" | awk '{print $1;}' | head -1`
PW_RUN explorer "/desktop=portwine,${pw_screen_resolution}" "$WINE_WIN_START" /unix "$portwine_exe" PW_RUN explorer "/desktop=portwine,${pw_screen_resolution}" "$portwine_exe"
elif [ ! -z "${PORTWINE_MSI}" ]; then elif [ ! -z "${PORTWINE_MSI}" ]; then
PW_RUN msiexec /i "$portwine_exe" PW_RUN msiexec /i "$portwine_exe"
elif [ ! -z "${PORTWINE_BAT}" ] || [ ! -z "${portwine_exe}" ]; then elif [ ! -z "${PORTWINE_BAT}" ] || [ ! -z "${portwine_exe}" ]; then
PW_RUN "$WINE_WIN_START" /unix "$portwine_exe" PW_RUN "$portwine_exe"
else else
PW_RUN "$WINE_WIN_START" explorer PW_RUN explorer
fi fi
} }
PORTWINE_CREATE_SHORTCUT () { PORTWINE_CREATE_SHORTCUT () {
...@@ -124,11 +124,11 @@ PORTWINE_DEBUG () { ...@@ -124,11 +124,11 @@ PORTWINE_DEBUG () {
free -m >> "${PORT_WINE_PATH}/${portname}.log" free -m >> "${PORT_WINE_PATH}/${portname}.log"
echo "-----------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" echo "-----------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
echo "Graphic cards and drivers" >> "${PORT_WINE_PATH}/${portname}.log" echo "Graphic cards and drivers" >> "${PORT_WINE_PATH}/${portname}.log"
"${WINELIB}/amd64/usr/bin/glxinfo" -B >> "${PORT_WINE_PATH}/${portname}.log" "${WINELIB}/runtime/bin/glxinfo" -B >> "${PORT_WINE_PATH}/${portname}.log"
echo "----------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" echo "----------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
echo "Vulkan info device name:" >> "${PORT_WINE_PATH}/${portname}.log" echo "Vulkan info device name:" >> "${PORT_WINE_PATH}/${portname}.log"
"${WINELIB}/amd64/usr/bin/vulkaninfo" | grep deviceName >> "${PORT_WINE_PATH}/${portname}.log" "${WINELIB}/runtime/bin/vulkaninfo" | grep deviceName >> "${PORT_WINE_PATH}/${portname}.log"
"${WINELIB}/amd64/usr/bin/vkcube" --c 50 "${WINELIB}/runtime/bin/vkcube" --c 50
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "Vulkan cube test passed successfully" >> "${PORT_WINE_PATH}/${portname}.log" echo "Vulkan cube test passed successfully" >> "${PORT_WINE_PATH}/${portname}.log"
else else
...@@ -141,17 +141,17 @@ PORTWINE_DEBUG () { ...@@ -141,17 +141,17 @@ PORTWINE_DEBUG () {
fi fi
echo "--------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" echo "--------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
echo "Version WINE in the Port" >> "${PORT_WINE_PATH}/${portname}.log" echo "Version WINE in the Port" >> "${PORT_WINE_PATH}/${portname}.log"
"$WINELOADER" --version 2>&1 | tee -a "${PORT_WINE_PATH}/${portname}.log" ${PW_RUNTIME} "$WINELOADER" --version 2>&1 | tee -a "${PORT_WINE_PATH}/${portname}.log"
echo "-------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" echo "-------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
echo "winetricks.log:" >> "${PORT_WINE_PATH}/${portname}.log" echo "winetricks.log:" >> "${PORT_WINE_PATH}/${portname}.log"
cat "${WINEPREFIX}/winetricks.log" >> "${PORT_WINE_PATH}/${portname}.log" cat "${WINEPREFIX}/winetricks.log" >> "${PORT_WINE_PATH}/${portname}.log"
echo "------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" echo "------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
if [ ! -z "${PORTWINE_DB_FILE}" ]; then if [ ! -z "${PORTWINE_DB_FILE}" ]; then
echo "Use ${PORTWINE_DB_FILE} db file:" >> "${PORT_WINE_PATH}/${portname}.log" echo "Use ${PORTWINE_DB_FILE} db file:" >> "${PORT_WINE_PATH}/${portname}.log"
cat "${PORTWINE_DB_FILE}" | sed '/##/d' | awk '{print $1 " " $2}' >> "${PORT_WINE_PATH}/${portname}.log" cat "${PORTWINE_DB_FILE}" | sed '/##/d' >> "${PORT_WINE_PATH}/${portname}.log"
else else
echo "Use ${PORT_SCRIPTS_PATH}/portwine_db/default db file:" >> "${PORT_WINE_PATH}/${portname}.log" echo "Use ${PORT_SCRIPTS_PATH}/portwine_db/default db file:" >> "${PORT_WINE_PATH}/${portname}.log"
cat "${PORT_SCRIPTS_PATH}/portwine_db/default" | sed '/##/d' | awk '{print $1 " " $2}' >> "${PORT_WINE_PATH}/${portname}.log" cat "${PORT_SCRIPTS_PATH}/portwine_db/default" | sed '/##/d' >> "${PORT_WINE_PATH}/${portname}.log"
fi fi
echo "-----------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log" echo "-----------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
echo "Log WINE:" >> "${PORT_WINE_PATH}/${portname}.log" echo "Log WINE:" >> "${PORT_WINE_PATH}/${portname}.log"
...@@ -168,11 +168,11 @@ PORTWINE_DEBUG () { ...@@ -168,11 +168,11 @@ PORTWINE_DEBUG () {
} }
PW_WINECFG () { PW_WINECFG () {
START_PORTWINE START_PORTWINE
PW_RUN "$WINE_WIN_START" winecfg PW_RUN winecfg
} }
PW_WINEFILE () { PW_WINEFILE () {
START_PORTWINE START_PORTWINE
PW_RUN "$WINE_WIN_START" explorer PW_RUN explorer
} }
PW_WINECMD () { PW_WINECMD () {
export PW_USE_TERMINAL=1 export PW_USE_TERMINAL=1
...@@ -181,13 +181,13 @@ PW_WINECMD () { ...@@ -181,13 +181,13 @@ PW_WINECMD () {
} }
PW_WINEREG () { PW_WINEREG () {
START_PORTWINE START_PORTWINE
PW_RUN "$WINE_WIN_START" regedit PW_RUN regedit
} }
PW_WINETRICKS () { PW_WINETRICKS () {
UPDATE_WINETRICKS UPDATE_WINETRICKS
export PW_USE_TERMINAL=1 export PW_USE_TERMINAL=1
START_PORTWINE START_PORTWINE
"${PORT_WINE_TMP_PATH}/winetricks" -q -r --force ${PW_TERM} "${PORT_WINE_TMP_PATH}/winetricks" -q --force
} }
PW_EDIT_DB () { PW_EDIT_DB () {
xdg-open "${PORTWINE_DB_FILE}" xdg-open "${PORTWINE_DB_FILE}"
......
...@@ -6,7 +6,8 @@ ...@@ -6,7 +6,8 @@
#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=1 export PW_FORCE_DISABLED_RUNTIME=1
#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
......
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