diff --git a/portwine_run_scripts/dxvk/x32/d3d10.dll b/portwine_run_scripts/dxvk/x32/d3d10.dll deleted file mode 100755 index c06c4d3..0000000 Binary files a/portwine_run_scripts/dxvk/x32/d3d10.dll and /dev/null differ diff --git a/portwine_run_scripts/dxvk/x32/d3d10_1.dll b/portwine_run_scripts/dxvk/x32/d3d10_1.dll deleted file mode 100755 index d14e844..0000000 Binary files a/portwine_run_scripts/dxvk/x32/d3d10_1.dll and /dev/null differ diff --git a/portwine_run_scripts/dxvk/x32/d3d10core.dll b/portwine_run_scripts/dxvk/x32/d3d10core.dll deleted file mode 100755 index ab12c10..0000000 Binary files a/portwine_run_scripts/dxvk/x32/d3d10core.dll and /dev/null differ diff --git a/portwine_run_scripts/dxvk/x32/d3d11.dll b/portwine_run_scripts/dxvk/x32/d3d11.dll deleted file mode 100755 index fa09b72..0000000 Binary files a/portwine_run_scripts/dxvk/x32/d3d11.dll and /dev/null differ diff --git a/portwine_run_scripts/dxvk/x32/dxgi.dll b/portwine_run_scripts/dxvk/x32/dxgi.dll deleted file mode 100755 index 3262034..0000000 Binary files a/portwine_run_scripts/dxvk/x32/dxgi.dll and /dev/null differ diff --git a/portwine_run_scripts/dxvk/x64/d3d10.dll b/portwine_run_scripts/dxvk/x64/d3d10.dll deleted file mode 100755 index 505e601..0000000 Binary files a/portwine_run_scripts/dxvk/x64/d3d10.dll and /dev/null differ diff --git a/portwine_run_scripts/dxvk/x64/d3d10_1.dll b/portwine_run_scripts/dxvk/x64/d3d10_1.dll deleted file mode 100755 index bbb5a99..0000000 Binary files a/portwine_run_scripts/dxvk/x64/d3d10_1.dll and /dev/null differ diff --git a/portwine_run_scripts/dxvk/x64/d3d10core.dll b/portwine_run_scripts/dxvk/x64/d3d10core.dll deleted file mode 100755 index cf9f47d..0000000 Binary files a/portwine_run_scripts/dxvk/x64/d3d10core.dll and /dev/null differ diff --git a/portwine_run_scripts/dxvk/x64/d3d11.dll b/portwine_run_scripts/dxvk/x64/d3d11.dll deleted file mode 100755 index be30f22..0000000 Binary files a/portwine_run_scripts/dxvk/x64/d3d11.dll and /dev/null differ diff --git a/portwine_run_scripts/dxvk/x64/dxgi.dll b/portwine_run_scripts/dxvk/x64/dxgi.dll deleted file mode 100755 index ba35565..0000000 Binary files a/portwine_run_scripts/dxvk/x64/dxgi.dll and /dev/null differ diff --git a/portwine_run_scripts/runlib b/portwine_run_scripts/runlib index bcb595b..6fc29f2 100644 --- a/portwine_run_scripts/runlib +++ b/portwine_run_scripts/runlib @@ -159,7 +159,7 @@ OPENGL_SET () { if [ -e "${config_path}/dxvk" ] then - bash "${link}/dxvk/setup_dxvk.sh" "uninstall" + bash "${link}/setup_dxvk.sh" "uninstall" rm -f "${config_path}/dxvk" else echo "DXVK is disabled" @@ -174,7 +174,7 @@ if [ -e "${config_path}/dxvk" ] then echo "DXVK is enabled" else - bash "${link}/dxvk/setup_dxvk.sh" "install" + sh "${link}/winetricks" -q --force dxvk echo "DXVK is enabled" > "${config_path}/dxvk" fi } diff --git a/portwine_run_scripts/setup b/portwine_run_scripts/setup index 480c961..26cd62c 100755 --- a/portwine_run_scripts/setup +++ b/portwine_run_scripts/setup @@ -77,16 +77,26 @@ echo ""[Desktop Entry]" "Icon="${PORT_WINE_PATH}/data/img/s.png""" > "${PORT_WINE_PATH}/Settings/winetricks.desktop" chmod u+x "${PORT_WINE_PATH}/Settings/winetricks.desktop" +echo ""[Desktop Entry]" +"Name=start_settings" +"Exec="${PORT_WINE_PATH}/data/scripts/start_settings"" +"Type=Application" +"Categories=Game" +"StartupNotify=true" +"Path="${PORT_WINE_PATH}/data/scripts/"" +"Icon="${PORT_WINE_PATH}/data/img/s.png""" > "${PORT_WINE_PATH}/Settings/start_settings.desktop" +chmod u+x "${PORT_WINE_PATH}/Settings/start_settings.desktop" + cp -f "${PORT_WINE_PATH}/data/prefix/reg.xuser/"* "${PORT_WINE_PATH}/data/prefix/" sed -i "s/crossover/$us_dir/g" "${PORT_WINE_PATH}/data/prefix/"*.reg sed -i "s/xuser/${USER}/g" "${PORT_WINE_PATH}/data/prefix/"*.reg cp -fR "${PORT_WINE_PATH}/data/prefix/drive_c/users/Public/" "${PORT_WINE_PATH}/data/prefix/drive_c/users/$us_dir/" -#ln -sf "/bin/ping" "${PORT_WINE_PATH}/data/prefix/drive_c/ping.exe" ln -sf "${PORT_WINE_PATH}/data/prefix/drive_c/" "${PORT_WINE_PATH}/drive_c" ADD_IN_POST_INSTALL +sh "${link}/start_settings" exit 0 diff --git a/portwine_run_scripts/dxvk/setup_dxvk.sh b/portwine_run_scripts/setup_dxvk.sh similarity index 100% rename from portwine_run_scripts/dxvk/setup_dxvk.sh rename to portwine_run_scripts/setup_dxvk.sh diff --git a/portwine_run_scripts/start b/portwine_run_scripts/start index 7ef477f..be33512 100755 --- a/portwine_run_scripts/start +++ b/portwine_run_scripts/start @@ -1,42 +1,4 @@ #!/bin/bash # Author: Tergoev M.A. . "$(dirname $(readlink -f "$0"))/runlib" -xsd=`zenity --title "${port_start1}" --text "${port_start2}" --list --radiolist --height=260 \ ---column="${inst_set}" --column "${port_start3}" \ -FALSE "${port_start4}" \ -TRUE "${port_start8}" \ -FALSE "${port_start6} (${port_start4})" \ -FALSE "${port_start6} (DXVK)" ` - -if [ $? -eq 1 ];then exit 1; fi -case $xsd in - "${port_start4}") - START_PORTWINE - WINE_DX_TO_OPENGL - OPENGL_SET - "${optirun_on}" "${WINELOADER}" "${gamestart}" "${launch_parameters}" ;; - - "${port_start6} (${port_start4})") - START_PORTWINE - WINE_DX_TO_OPENGL - OPENGL_SET - . "${link}/debug" ;; - - "${port_start6} (DXVK)") - START_PORTWINE - WINE_DX_TO_VULKAN - VULKAN_SET - . "${link}/debug" ;; - - "${port_start8}") - START_PORTWINE - WINE_DX_TO_VULKAN - VULKAN_SET - "${optirun_on}" "${WINELOADER}" "${gamestart}" "${launch_parameters}" ;; - -esac - -STOP_PORTWINE - - - +sh "${link}"/start_settings diff --git a/portwine_run_scripts/start_settings b/portwine_run_scripts/start_settings new file mode 100755 index 0000000..cd36d12 --- /dev/null +++ b/portwine_run_scripts/start_settings @@ -0,0 +1,178 @@ +#!/bin/bash +# Author: Tergoev M.A. +######################################################################## +. "$(dirname $(readlink -f "$0"))/runlib" +wget -T 2 --output-document="${link}/dxvk.tar.gz" $(curl —silent "https://api.github.com/repos/doitsujin/dxvk/releases/latest" | grep -Po '"browser_download_url": "\K.*?(?=")') +if [ $? -eq 1 ]; then + zenity --error --title "Ошибка!" --text "Не удалось скачать скрипт установки DXVK, проверьте соединение с интернетом и повторите настройку запустив ярлык start_settings из каталога: \n\n"${PORT_WINE_PATH}/settings/"" --no-wrap + exit 1; +fi +rm -f "${link}"/setup_dxvk.sh +tar -xzvf "${link}"/dxvk.tar.gz -C "${link}" +rm -f "${link}"/dxvk.tar.gz +mv "${link}"/dxvk-*/setup_dxvk.sh "${link}"/setup_dxvk.sh +rm -fr "${link}"/dxvk-* +start_settings=`zenity --title "Опции запуска" --text "Выбирете желаемый вариант запуска ${portname}. Вы всегда можете изменить свой выбор, \nзапустив ярлык start_settings из каталога: \n"${PORT_WINE_PATH}"/settings/" --list --radiolist \ +--column="${inst_set}" --column "Версия" --column "Совместимость" --width=600 --height=300 \ +TRUE "Cтандартный запуск" "Старый запуск, с вопросами и логами" \ +FALSE "Только OpenGL" "Использовать библиотеки WINE" \ +FALSE "Только DXVK_latest" "AMD/Intel: latest: Nvidia: latest" \ +FALSE "Только DXVK_1.2.3" "AMD/Intel: Mesa 19.1-git+: Nvidia: 418.52.05+" \ +FALSE "Только DXVK_1.0.3" "AMD: Mesa 18.1.2+; Nvidia:396.24.02+" ` + +if [ $? -eq 1 ];then exit 1; fi +case $start_settings in + "Только стандартный запуск") + +bash "${link}/setup_dxvk.sh" "uninstall" +if [ -e "${config_path}/dxvk" ] +then + rm -f "${config_path}/dxvk" +else + echo "DXVK is disabled" +fi + +cat > "${link}/start" < "${link}/start" < "${config_path}/dxvk" + +cat > "${link}/start" < "${config_path}/dxvk" + +cat > "${link}/start" < "${config_path}/dxvk" + +cat > "${link}/start" <