major changes

data_from_portwine/scripts/create_shortcut

@@ -2,18 +2,16 @@
 # Author: PortWINE-Linux.ru
 . "$(dirname $(readlink -f "$0"))/runlib"
 ########################################################################
-PORTPROTON_NAME=$(zenity --entry --text "${sc_name}")
-if [ $? -eq 1 ];then exit 1; fi
 PORTPROTON_EXE=$(zenity --file-selection --file-filter=""*.exe" "*.bat"" \
 --title="${sc_path}" --filename="${PORT_WINE_PATH}/data/pfx/drive_c/")
 if [ $? -eq 1 ];then exit 1; fi
+PORTPROTON_NAME="$(basename "${PORTPROTON_EXE}" | sed s/".exe"/""/g )"
 PORTPROTON_PATH="$( cd "$( dirname "${PORTPROTON_EXE}" )" >/dev/null 2>&1 && pwd )" 
 if [ -x "`which wrestool 2>/dev/null`" ]; then
-    wrestool -x --output="${PORT_WINE_PATH}/data/img/" -t14 "${PORTPROTON_EXE}"
+    wrestool -x --output="${PORTPROTON_PATH}/" -t14 "${PORTPROTON_EXE}"
+    cp "$(ls -S -1 "${PORTPROTON_EXE}"*".ico"  | head -n 1)" "${PORTPROTON_EXE}.ico"
+    cp -f "${PORTPROTON_EXE}.ico" "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.ico"
 fi
-PORTPROTON_IMG=$(zenity --file-selection --file-filter=""*.png" "*.ico"" \
---title="${sc_img}" --filename="${PORT_WINE_PATH}/data/img/")
-if [ $? -eq 1 ];then exit 1; fi
 PORTPROTON_CMD=""
 #PORTPROTON_CMD=$(zenity --entry --text "${sc_cmd}")
 #if [ $? -eq 1 ];then exit 1; fi
@@ -54,7 +52,6 @@ start_settings=`zenity --title  "${ss_title}" --text "${ss_text}" --list --radio
             fi ;;
     esac  
 ########################################################################
-cp -f "${PORTPROTON_IMG}" "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.png"
 name_desktop="${PORTPROTON_NAME}" 
 echo "[Desktop Entry]" > "${PORT_WINE_PATH}/${name_desktop}.desktop"
 echo "Name=${PORTPROTON_NAME}" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" 
@@ -64,7 +61,10 @@ echo "Type=Application" >> "${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 "Path="${PORT_SCRIPTS_PATH}/"" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
-echo "Icon="${PORTPROTON_IMG}"" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
-chmod +x "${PORT_WINE_PATH}/${name_desktop}.desktop"
+echo "Icon="${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.ico"" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+chmod u+x "${PORT_WINE_PATH}/${name_desktop}.desktop"
 ########################################################################
-`zenity --info --title "Успешно." --text "Ярлык создан в корневом каталоге порта." --no-wrap ` > /dev/null 2>&1  
+`zenity --question --title "${inst_set}." --text "${ss_done}" --no-wrap ` > /dev/null 2>&1  
+if [ $? -eq "0" ]; then
+	cp -f "${PORT_WINE_PATH}/${name_desktop}.desktop" /home/${USER}/.local/share/applications/ 
+fi

data_from_portwine/scripts/lang

@@ -16,7 +16,8 @@ then
 	export ss_default_1="Cтандартный запуск"
 	export ss_default_2="Старый запуск, с вопросами и логами"
 	export ss_ogl_2="Использовать OpenGL и VKD3D. (DX9-DX11 в OpenGL и DX12 в vulkan)"
-	export ss_ogl_3="Использовать DXVK и D9VK. (DX9-DX11 в Vulkan и выключить DX12)" 
+	export ss_ogl_3="Использовать DXVK и D9VK. (DX9-DX11 в Vulkan и выключить DX12)"
+	export ss_done="Ярлык создан в корневом каталоге порта.\nДобавить его в МЕНЮ -> ИГРЫ?" 
 
 	export inst_succ="Установка завершена успешно!"
 
@@ -90,6 +91,7 @@ then
 	export ss_default_2="Old startup, with questions and logs"
 	export ss_ogl_2="Use OpenGL and VKD3D. (DX9-DX11 to OpenGL and DX12 to vulkan)"
 	export ss_ogl_3="Use DXVK and D9VK. (DX9-DX11 to Vulkan)" 
+	export ss_done="The shortcut was created in the ${portname} directory.\nAdd it to MENU -> GAMES?" 
 
 	export inst_succ="The installation was successful."
 

data_from_portwine/scripts/runlib

@@ -50,6 +50,7 @@ export WINEPREFIX="${PORT_WINE_PATH}/data/pfx"
 export PATH="${WINEDIR}/bin:${PATH}"
 export WINESTART="C:\\windows\\command\\start.exe"
 export STEAM_COMPAT_DATA_PATH="${PORT_WINE_PATH}/data/"
+export PW_COMPAT_MEDIA_PATH="${PW_COMPAT_MEDIA_PATH}"
 ########################################################################
 export urlg="http://portwine-linux.ru/donate"
 ########################################################################
@@ -131,17 +132,9 @@ echo "DXVK_HUD=${DXVK_HUD}"
 
 if [ "${var_dxvk_on}" != "off" ]; then
     export PW_USE_WINED3D=0
-    export PW_NO_D3D9=0
-    export PW_NO_D3D10=0
-    export PW_NO_D3D11=0
-    export PW_OLD_GL_STRING=0
     echo "Use DXVK and D9VK (DX9-DX11 to Vulkan)" 
 else
     export PW_USE_WINED3D=1
-    export PW_NO_D3D9=0
-    export PW_NO_D3D10=0
-    export PW_NO_D3D11=0
-    export PW_OLD_GL_STRING=0
     echo "Use OpenGL and VKD3D (DX9-DX11 to OpenGL and DX12 to vulkan)" 
 fi
 

data_from_portwine/scripts/setup

@@ -115,7 +115,7 @@ fi
 if [ -f "${PORT_WINE_PATH}/restart.desktop" ]; then
 	rm "${PORT_WINE_PATH}/restart.desktop"
 fi
-
+START_PORTWINE
 ADD_IN_POST_INSTALL
 
 xdg-open "http://portwine-linux.ru/portwine-faq/" > /dev/null 2>&1 & exit 0  

data_from_portwine/scripts/vars

@@ -2,7 +2,7 @@
 # License GPL
 # Author: Tergoev M.A.
 ########################################################################
-export portname=
+export portname=PortProton
 export gamename=
 export gamedir=
 if [ ! -z "${gamedir}" ]; then
@@ -16,12 +16,16 @@ export WINEDLLOVERRIDES="winemenubuilder.exe=d"
 export STAGING_SHARED_MEMORY=1
 export PW_LOG=0     # 1-ENABLE_DEBUG_MODE_FOR_TERMINAL 
 export PW_NO_VR=1
+export PW_NO_D3D9=0
+export PW_NO_D3D10=0
+export PW_NO_D3D11=0
+export PW_NO_D3D12=0
 export PW_NO_FSYNC=0
 export PW_NO_ESYNC=1
-export PW_FILELOCK=1
 export PW_DXVK_ASYNC=0
 export PW_DXGI_NATIVE=0
 export PW_USE_SECCOMP=0
+export PW_OLD_GL_STRING=0
 export PW_NO_WINEMFPLAY=1
 export PW_NVAPI_DISABLE=1
 export PW_NO_WRITE_WATCH=1