Commit 5de97e18 authored by Mikhail Tergoev's avatar Mikhail Tergoev

Add fix and english language for start_settings

parent b19cef72
...@@ -9,10 +9,13 @@ then ...@@ -9,10 +9,13 @@ then
export inst_set="Выбор" export inst_set="Выбор"
export inst_set_top="Установка PortWINE" export inst_set_top="Установка PortWINE"
export inst_set_vid1="Какая у вас видеокарта?"
export inst_set_vid2="Видеокарта" export ss_title="Опции запуска:"
export inst_set_vid3="Объем памяти вашей видеокарты?" export ss_text="Выбирете желаемый вариант запуска ${portname}. Вы всегда можете изменить свой выбор, \nзапустив ярлык start_settings из каталога: \n"${PORT_WINE_PATH}"/settings/"
export inst_set_vid4="Видео память (Мб)" export ss_ver="Версия?"
export ss_default_1="Cтандартный запуск"
export ss_default_2="Старый запуск, с вопросами и логами"
export ss_ogl_2="Использовать библиотеки WINE"
export inst_succ="Установка завершена успешно!" export inst_succ="Установка завершена успешно!"
...@@ -54,10 +57,13 @@ then ...@@ -54,10 +57,13 @@ then
export inst_set="Sett..." export inst_set="Sett..."
export inst_set_top="PortWINE setting" export inst_set_top="PortWINE setting"
export inst_set_vid1="Select your video card."
export inst_set_vid2="Video card:" export ss_title="Settings::"
export inst_set_vid3="Memory size your video card?" export ss_text="Choose your preferred ${portname} launch option. You can always change your choice by unsetting\nthe start_settings shortcut from the directory:\n"${PORT_WINE_PATH}"/settings/"
export inst_set_vid4="VRAM:" export ss_ver="Version:"
export ss_default_1="Standard start"
export ss_default_2="Old startup, with questions and logs"
export ss_ogl_2="Use the built-in WINE libraries"
export inst_succ="The installation was successful." export inst_succ="The installation was successful."
......
...@@ -16,17 +16,17 @@ tar -xzvf "${link}"/dxvk.tar.gz -C "${link}" ...@@ -16,17 +16,17 @@ tar -xzvf "${link}"/dxvk.tar.gz -C "${link}"
rm -f "${link}"/dxvk.tar.gz rm -f "${link}"/dxvk.tar.gz
mv "${link}"/dxvk-*/setup_dxvk.sh "${link}"/setup_dxvk.sh mv "${link}"/dxvk-*/setup_dxvk.sh "${link}"/setup_dxvk.sh
rm -fr "${link}"/dxvk-* rm -fr "${link}"/dxvk-*
start_settings=`zenity --title "Опции запуска" --text "Выбирете желаемый вариант запуска ${portname}. Вы всегда можете изменить свой выбор, \nзапустив ярлык start_settings из каталога: \n"${PORT_WINE_PATH}"/settings/" --list --radiolist \ start_settings=`zenity --title "${ss_title}" --text "${ss_text}" --list --radiolist \
--column="${inst_set}" --column "Версия" --column "Совместимость" --width=600 --height=300 \ --column="${inst_set}" --column "${ss_ver}" --column "${ss_dr}" --width=600 --height=300 \
TRUE "Cтандартный запуск" "Старый запуск, с вопросами и логами" \ TRUE "${ss_default_1}" "${ss_default_2}" \
FALSE "OpenGL" "Использовать библиотеки WINE" \ FALSE "OpenGL" "${ss_ogl_2}" \
FALSE "DXVK_latest" "AMD/Intel: latest: Nvidia: latest" \ 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.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+" ` FALSE "DXVK_1.0.3" "AMD: Mesa 18.1.2+; Nvidia:396.24.02+" `
if [ $? -eq 1 ];then exit 1; fi if [ $? -eq 1 ];then exit 1; fi
case $start_settings in case $start_settings in
"Cтандартный запуск") "${ss_default_1}")
bash "${link}/setup_dxvk.sh" "uninstall" | sszen bash "${link}/setup_dxvk.sh" "uninstall" | sszen
if [ -e "${config_path}/dxvk" ] if [ -e "${config_path}/dxvk" ]
...@@ -108,7 +108,7 @@ cat > "${link}/start" <<EOF ...@@ -108,7 +108,7 @@ cat > "${link}/start" <<EOF
. "\$(dirname \$(readlink -f "\$0"))/runlib" . "\$(dirname \$(readlink -f "\$0"))/runlib"
START_PORTWINE START_PORTWINE
WINE_DX_TO_VULKAN WINE_DX_TO_VULKAN
"\${optirun_on}" "\${WINELOADER}" "\${gamestart}" "\${launch_parameters}" ;; "\${optirun_on}" "\${WINELOADER}" "\${gamestart}" "\${launch_parameters}"
STOP_PORTWINE STOP_PORTWINE
EOF EOF
;; ;;
...@@ -124,14 +124,14 @@ cat > "${link}/start" <<EOF ...@@ -124,14 +124,14 @@ cat > "${link}/start" <<EOF
. "\$(dirname \$(readlink -f "\$0"))/runlib" . "\$(dirname \$(readlink -f "\$0"))/runlib"
START_PORTWINE START_PORTWINE
WINE_DX_TO_VULKAN WINE_DX_TO_VULKAN
"\${optirun_on}" "\${WINELOADER}" "\${gamestart}" "\${launch_parameters}" ;; "\${optirun_on}" "\${WINELOADER}" "\${gamestart}" "\${launch_parameters}"
STOP_PORTWINE STOP_PORTWINE
EOF EOF
;; ;;
"DXVK_latest") "DXVK_latest")
bash "${link}/setup_dxvk.sh" "uninstall" bash "${link}/setup_dxvk.sh" "uninstall" | sszen
sh "${link}/winetricks" -q --force dxvk sh "${link}/winetricks" -q --force dxvk | sszen
echo "DXVK is enabled" > "${config_path}/dxvk" echo "DXVK is enabled" > "${config_path}/dxvk"
cat > "${link}/start" <<EOF cat > "${link}/start" <<EOF
...@@ -140,7 +140,7 @@ cat > "${link}/start" <<EOF ...@@ -140,7 +140,7 @@ cat > "${link}/start" <<EOF
. "\$(dirname \$(readlink -f "\$0"))/runlib" . "\$(dirname \$(readlink -f "\$0"))/runlib"
START_PORTWINE START_PORTWINE
WINE_DX_TO_VULKAN WINE_DX_TO_VULKAN
"\${optirun_on}" "\${WINELOADER}" "\${gamestart}" "\${launch_parameters}" ;; "\${optirun_on}" "\${WINELOADER}" "\${gamestart}" "\${launch_parameters}"
STOP_PORTWINE STOP_PORTWINE
EOF EOF
;; ;;
...@@ -148,35 +148,3 @@ EOF ...@@ -148,35 +148,3 @@ EOF
esac esac
######################################################################## ########################################################################
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