Add start_settings scripts

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
 }

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

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

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" <<EOF
+#!/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
+EOF
+;;
+	"OpenGL") 
+
+bash "${link}/setup_dxvk.sh" "uninstall"
+if [ -e "${config_path}/dxvk" ]
+then
+	rm -f "${config_path}/dxvk"
+fi
+
+cat > "${link}/start" <<EOF
+#!/bin/bash
+# Author: Tergoev M.A.
+. "\$(dirname \$(readlink -f "\$0"))/runlib"
+START_PORTWINE
+WINE_DX_TO_OPENGL
+"\${optirun_on}" "\${WINELOADER}" "\${gamestart}" "\${launch_parameters}"
+STOP_PORTWINE
+EOF
+;;
+	"DXVK_1.0.3") 
+
+bash "${link}/setup_dxvk.sh" "uninstall"
+sh "${link}/winetricks" -q --force dxvk103
+echo "DXVK is enabled" > "${config_path}/dxvk"
+
+cat > "${link}/start" <<EOF
+#!/bin/bash
+# Author: Tergoev M.A.
+. "\$(dirname \$(readlink -f "\$0"))/runlib"
+START_PORTWINE
+WINE_DX_TO_VULKAN 
+"\${optirun_on}" "\${WINELOADER}" "\${gamestart}" "\${launch_parameters}" ;;
+STOP_PORTWINE
+EOF
+;;
+	"DXVK_1.2.3") 
+
+bash "${link}/setup_dxvk.sh" "uninstall"
+sh "${link}/winetricks" -q --force dxvk123
+echo "DXVK is enabled" > "${config_path}/dxvk"
+
+cat > "${link}/start" <<EOF
+#!/bin/bash
+# Author: Tergoev M.A.
+. "\$(dirname \$(readlink -f "\$0"))/runlib"
+START_PORTWINE
+WINE_DX_TO_VULKAN 
+"\${optirun_on}" "\${WINELOADER}" "\${gamestart}" "\${launch_parameters}" ;;
+STOP_PORTWINE
+EOF
+;;
+	"DXVK_latest") 
+
+bash "${link}/setup_dxvk.sh" "uninstall"
+sh "${link}/winetricks" -q --force dxvk
+echo "DXVK is enabled" > "${config_path}/dxvk"
+
+cat > "${link}/start" <<EOF
+#!/bin/bash
+# Author: Tergoev M.A.
+. "\$(dirname \$(readlink -f "\$0"))/runlib"
+START_PORTWINE
+WINE_DX_TO_VULKAN 
+"\${optirun_on}" "\${WINELOADER}" "\${gamestart}" "\${launch_parameters}" ;;
+STOP_PORTWINE
+EOF
+;;
+
+esac 
+########################################################################
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+