Global update of the port_on file

data_from_portwine/scripts/create_shortcut

@@ -42,10 +42,10 @@ start_settings=`zenity --title  "${ss_title}" --text "${ss_text}" --list --radio
             if [ ! -z $hud_settings ]; then
                 for hud_set in $hud_settings
                 do
-                    echo "${hud_set}" >> "${config_path}/dxvk_on_shortcut"
+                    echo "${hud_set}" >> "${PORT_WINE_TMP_PATH}/dxvk_on_shortcut"
                 done  
-                sed -i "s/|/,/g" "${config_path}/dxvk_on_shortcut"
-                read "hud_set" < "${config_path}/dxvk_on_shortcut"
+                sed -i "s/|/,/g" "${PORT_WINE_TMP_PATH}/dxvk_on_shortcut"
+                read "hud_set" < "${PORT_WINE_TMP_PATH}/dxvk_on_shortcut"
                 export dxvk_ogl_var="$hud_set"
             else
                 dxvk_ogl_var="0"

data_from_portwine/scripts/debug

@@ -7,7 +7,7 @@ echo "${port_deb1}" > "${PORT_WINE_PATH}/${portname}.log"
 echo "${port_deb2}" >> "${PORT_WINE_PATH}/${portname}.log"
 echo "--------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
 echo "PortWINE version:" >> "${PORT_WINE_PATH}/${portname}.log"
-read install_ver < "${config_path}/${portname}_ver"
+read install_ver < "${PORT_WINE_TMP_PATH}/${portname}_ver"
 echo "${portname}-${install_ver}" >> "${PORT_WINE_PATH}/${portname}.log"
 echo "-------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
 echo "var_dxvk_on = ${var_dxvk_on}" >> "${PORT_WINE_PATH}/${portname}.log"

data_from_portwine/scripts/lang

 #!/bin/bash
 # Author: PortWINE-Linux.ru
 
-read "update_loc" < "${config_path}/${portname}_loc"
+read "update_loc" < "${PORT_WINE_TMP_PATH}/${portname}_loc"
 export update_loc=${update_loc}
 
 if [ "${update_loc}" = "RUS" ] 

data_from_portwine/scripts/port_update

 #!/bin/bash
 # Author: PortWINE-Linux.ru
 
-if [ ! -f "${config_path}/${portname}_ver" ]
+if [ ! -f "${PORT_WINE_TMP_PATH}/${portname}_ver" ]
 then
-	echo "10" > "${config_path}/${portname}_ver"
+	echo "10" > "${PORT_WINE_TMP_PATH}/${portname}_ver"
 fi
 
-if [ ! -f "${config_path}/update_notifier" ]
+if [ ! -f "${PORT_WINE_TMP_PATH}/update_notifier" ]
 then
-	echo "1" > "${config_path}/update_notifier"
+	echo "1" > "${PORT_WINE_TMP_PATH}/update_notifier"
 fi 
-read "update_not" < "${config_path}/update_notifier"
+read "update_not" < "${PORT_WINE_TMP_PATH}/update_notifier"
 if [ "${update_not}" = "1" ] 
 then
-	wget -T 2 --output-document="${config_path}/${portname}_cur_ver" "http://portwine-linux.ru/current_version/${portname}_ver"
+	wget -T 2 --output-document="${PORT_WINE_TMP_PATH}/${portname}_cur_ver" "http://portwine-linux.ru/current_version/${portname}_ver"
 	sleep 1
-	if [ -f "${config_path}/${portname}_ver" ]
+	if [ -f "${PORT_WINE_TMP_PATH}/${portname}_ver" ]
 	then
-		read current_ver < "${config_path}/${portname}_cur_ver"
-		read install_ver < "${config_path}/${portname}_ver"
-		rm -f "${config_path}/${portname}_cur_ver"
+		read current_ver < "${PORT_WINE_TMP_PATH}/${portname}_cur_ver"
+		read install_ver < "${PORT_WINE_TMP_PATH}/${portname}_ver"
+		rm -f "${PORT_WINE_TMP_PATH}/${portname}_cur_ver"
 		if  [ "${current_ver}" -gt "${install_ver}" ]
 		then	
 			xsd=`zenity --title  "${port_upd1}" --text "${port_upd2}" --list --radiolist --height=220 --column="${inst_set}" --column "${port_upd3}" \
@@ -34,7 +34,7 @@ then
 				"${port_upd5}")
 					echo " " ;;	
 				"${port_upd6}")
-				echo "0" > "${config_path}/update_notifier" ;;
+				echo "0" > "${PORT_WINE_TMP_PATH}/update_notifier" ;;
 			esac 
 		fi
 	fi

data_from_portwine/scripts/portproton.sh

@@ -6,9 +6,9 @@ if [ -f "$1" ]; then
     export PATH_TO_GAME="$( cd "$( dirname "$1" )" >/dev/null 2>&1 && pwd )"
     START_PORTWINE
     if [ ! -z ${optirun_on} ]; then
-        $PW_TERM ${optirun_on} "${port_on_run}" "run" "$portwine_exe"
+        "${PW_RUNTIME}" $PW_TERM ${optirun_on} "${port_on_run}" "run" "$portwine_exe"
     else
-        $PW_TERM "${port_on_run}" "run" "$portwine_exe"
+        "${PW_RUNTIME}" $PW_TERM "${port_on_run}" "run" "$portwine_exe"
     fi
 else
     START_PORTWINE

data_from_portwine/scripts/reset

@@ -6,8 +6,8 @@ wine_pids=$(ls -l /proc/*/exe 2>/dev/null | grep -E 'wine(64)?-preloader|wineser
 if ! [ -z "${wine_pids}" ] ; then
     kill -9 ${wine_pids}
 fi
-if [ -e "${config_path}/dxvk_on" ]; then
-    rm -f "${config_path}/dxvk_on"
+if [ -e "${PORT_WINE_TMP_PATH}/dxvk_on" ]; then
+    rm -f "${PORT_WINE_TMP_PATH}/dxvk_on"
 fi
 START_PORTWINE
 STOP_PORTWINE | pwzen

data_from_portwine/scripts/runlib

 #!/bin/bash
 # Author: PortWINE-Linux.ru
 ########################################################################
+clear && echo '
+████─████─████─███─█───█─███─█──█─███
+█──█─█──█─█──█──█──█───█──█──██─█─█
+████─█──█─████──█──█─█─█──█──█─██─███
+█────█──█─█─█───█──█████──█──█──█─█
+█────████─█─█───█───█─█──███─█──█─███
+
+'
+########################################################################
 [ $(id -u) = 0 ] && echo "Do not run this script as root!" && zenity --error --text "Do not run this script as root!" && exit 1
 ########################################################################
 sszen() {
@@ -20,29 +29,30 @@ export portname
 cd "${PORT_SCRIPTS_PATH}"
 . "${PORT_SCRIPTS_PATH}/vars/${portname}_vars"
 ########################################################################
-export config_path="${PORT_WINE_PATH}/data/tmp"
-if [ ! -d "${config_path}" ]; then
-	mkdir -p "${config_path}"
+export PORT_WINE_TMP_PATH="${PORT_WINE_PATH}/data/tmp"
+if [ ! -d "${PORT_WINE_TMP_PATH}" ]; then
+	mkdir -p "${PORT_WINE_TMP_PATH}"
 fi
 if [ ! -d "${HOME}/.PortWINE/tmp" ]; then
 	mkdir -p "${HOME}/.PortWINE/tmp"
 fi
-if [ ! -e "${config_path}/${portname}_loc" ]; then
+if [ ! -e "${PORT_WINE_TMP_PATH}/${portname}_loc" ]; then
 	SET_LANG=`zenity --title  "Install $portname" --text "Select the language" --list --radiolist \
 	--column="Set:" --column "Language:" \
 	TRUE "RUS" \
 	FALSE "ENG" `
-	echo "${SET_LANG}" > "${config_path}/${portname}_loc"
+	echo "${SET_LANG}" > "${PORT_WINE_TMP_PATH}/${portname}_loc"
 fi
 ########################################################################
 . "${PORT_SCRIPTS_PATH}"/lang
-if [ ! -e "${config_path}/${portname}_ver" ]; then
-	echo "10" > "${config_path}/${portname}_ver"
+if [ ! -e "${PORT_WINE_TMP_PATH}/${portname}_ver" ]; then
+	echo "10" > "${PORT_WINE_TMP_PATH}/${portname}_ver"
 fi
 ########################################################################
+export pw_libs_ver="_v2"
 export port_on_run="${PORT_WINE_PATH}/data/port_on"
 export WINEDIR="${PORT_WINE_PATH}"/data/dist
-export WINELIB="${HOME}/.PortWINE/libs"
+export WINELIB="${HOME}/.PortWINE/libs${pw_libs_ver}"
 export WINEARCH=win64
 export WINELOADER="${WINEDIR}/bin/wine"
 export WINEDLLPATH="${WINEDIR}/lib64/wine:${WINEDIR}/lib/wine"
@@ -52,11 +62,18 @@ export PATH="${WINEDIR}/bin:${PATH}"
 export WINESTART="C:\\windows\\command\\start.exe"
 export PW_COMPAT_DATA_PATH="${PORT_WINE_PATH}/data/"
 export PW_COMPAT_MEDIA_PATH="${PW_COMPAT_MEDIA_PATH}"
+export PW_RUNTIME="$WINELIB/run.sh"
 ########################################################################
 export urlg="https://portwine-linux.ru/portwine-faq/"
 export PW_FTP_URL="https://portwine-linux.ru/ftp"
 ########################################################################
 export PW_TERM=""
+#if [ ! -f "${PORT_WINE_TMP_PATH}/init_run_suc" ]; then
+#    export PW_USE_TERMINAL="1"
+#fi
+########################################################################
+START_PORTWINE ()
+{
 if [ "${PW_USE_TERMINAL}" = "1"  ]; then
     if [ -x "`which konsole 2>/dev/null`" ]; then
         export PW_TERM="konsole -e"
@@ -70,38 +87,25 @@ if [ "${PW_USE_TERMINAL}" = "1"  ]; then
 #        export PW_TERM="xfce4-terminal -x" #test
     fi
 fi
-########################################################################
-START_PORTWINE ()
-{
 sh "${PORT_SCRIPTS_PATH}"/port_update 
-echo "########################"
+########################################################################
 if [ ! -d "${WINELIB}" ]; then 
     echo "Download and install libraries..."
-    wget -T 2 --output-document="${HOME}/.PortWINE/tmp/libs.tar.xz" "${PW_FTP_URL}"/dist/libs.tar.xz | sszen &&
-    tar -Jxvf "${HOME}/.PortWINE/tmp/libs.tar.xz" -C "${HOME}/.PortWINE/" | sszen &&
-    rm -f "${HOME}/.PortWINE/tmp/libs.tar.xz"
+    wget -T 2 --output-document="${HOME}/.PortWINE/tmp/libs${pw_libs_ver}.tar.xz" "${PW_FTP_URL}"/dist/libs${pw_libs_ver}.tar.xz | sszen &&
+    tar -Jxvf "${HOME}/.PortWINE/tmp/libs${pw_libs_ver}.tar.xz" -C "${HOME}/.PortWINE/" | sszen &&
+    rm -f "${HOME}/.PortWINE/tmp/libs${pw_libs_ver}.tar.xz"
+    "${WINELIB}"/setup.sh --force
 fi
 if [ -d "${WINELIB}" ]; then 
-    host_lib_paths=
-    /sbin/ldconfig -XNv | grep "/"  | cut -d: -f1 1> "${config_path}"/default_lib_paths
-    while read lib_path_prefix; do
-    export host_lib_paths=$host_lib_paths$lib_path_prefix:
-    done < "${config_path}"/default_lib_paths
-    host_lib_paths="${WINELIB}/pinned_libs_32:${WINELIB}/pinned_libs_64:$host_lib_paths"
-    portwine_runtime_libs_paths="$host_lib_paths${WINELIB}/lib/i386-linux-gnu:${WINELIB}/usr/lib/i386-linux-gnu:${WINELIB}/lib/x86_64-linux-gnu:${WINELIB}/usr/lib/x86_64-linux-gnu:${WINELIB}/lib:${WINELIB}/usr/lib"
-    if [ ! -z $LD_LIBRARY_PATH ]; then
-        export LD_LIBRARY_PATH="$portwine_runtime_libs_paths:${LD_LIBRARY_PATH-}"
-    else
-        export LD_LIBRARY_PATH="$portwine_runtime_libs_paths"
-    fi
-    echo "########################"
+    echo "######################################################"
     echo "Runtime libraries is enabled"
+#    "${PW_RUNTIME}" --print-steam-runtime-library-paths
 else
-    echo "########################"
+    echo "######################################################"
     echo "Runtime libraries is disabled"
 fi
 ########################################################################
-if [ ! -f "${config_path}/dxvk_on" ]
+if [ ! -f "${PORT_WINE_TMP_PATH}/dxvk_on" ]
 then
     start_settings=`zenity --title  "${ss_title}" --text "${ss_text}" --list --radiolist \
     --column="${inst_set}" --column "${ss_ver}" --column "${ss_dr}"  --width=500 --height=220 \
@@ -110,7 +114,7 @@ then
     if [ $? -eq 1 ];then exit 1; fi
     case $start_settings in
     "VKD3D and OpenGL") 
-            echo "off" > "${config_path}/dxvk_on" ;;
+            echo "off" > "${PORT_WINE_TMP_PATH}/dxvk_on" ;;
     "DXVK") 
             hud_settings=`zenity --list --title  "HUD" --text "${hud_text}" --list --checklist \
             --column="${inst_set}" --column="HUD info:" --column="${hud_info}" --width=800 --height=550 \
@@ -130,11 +134,11 @@ then
             if [ ! -z $hud_settings ]; then
                 for hud_set in $hud_settings
                 do
-                    echo "${hud_set}" >> "${config_path}/dxvk_on" 
+                    echo "${hud_set}" >> "${PORT_WINE_TMP_PATH}/dxvk_on" 
                 done  
-                sed -i "s/|/,/g" "${config_path}/dxvk_on" 
+                sed -i "s/|/,/g" "${PORT_WINE_TMP_PATH}/dxvk_on" 
             else
-                echo "0" > "${config_path}/dxvk_on"
+                echo "0" > "${PORT_WINE_TMP_PATH}/dxvk_on"
             fi ;;
     esac  
 fi
@@ -142,7 +146,7 @@ fi
 if [ ! -z $dxvk_ogl_var ]; then
     var_dxvk_on="${dxvk_ogl_var}"
 else
-    read "var_dxvk_on" < "${config_path}/dxvk_on"
+    read "var_dxvk_on" < "${PORT_WINE_TMP_PATH}/dxvk_on"
 fi
 export DXVK_HUD="${var_dxvk_on}"
 echo "DXVK_HUD=${DXVK_HUD}"
@@ -150,7 +154,6 @@ echo "DXVK_HUD=${DXVK_HUD}"
 if [ "${var_dxvk_on}" != "off" ]; then
     export PW_USE_WINED3D=0
     echo "Use DXVK and D9VK (DX9-DX11 to Vulkan)"
-    export PW_VKD3D_FEATURE_LEVEL=0
 else
     export PW_USE_WINED3D=1
     echo "Use OpenGL and VKD3D (DX9-DX11 to OpenGL and DX12 to vulkan)" 
@@ -201,10 +204,6 @@ case "$PW_FORCE_USE_VSYNC" in  # 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
 esac
 export DXVK_CONFIG_FILE="${PORT_WINE_PATH}/data/dxvk.conf"
 ########################################################################
-export def_pfx="${PORT_WINE_PATH}/data/dist/share/default_pfx/"
-if [ ! -d "${def_pfx}" ]; then
-	"${port_on_run}" "run" | pwzen
-fi
 export int_xneur=0
 if [ $(pgrep xneur)>'0' ]; then
 	killall xneur
@@ -224,7 +223,28 @@ else
     export PW_GAMEMODERUN=0
     echo "Gamemod is not installed or disabled in vars script: PW_FORCE_DISABLED_GAMEMOD=$PW_FORCE_DISABLED_GAMEMOD"
 fi
-echo "########################"
+echo "######################################################"
+########################################################################
+if [ ! -d "${WINEPREFIX}" ] || [ ! -d "${WINEPREFIX}"/dosdevices ] || [ ! -d "${WINEPREFIX}"/drive_c/windows ] || [ ! -f "${WINEPREFIX}"/system.reg ] || [ ! -f "${WINEPREFIX}"/user.reg ] || [ ! -f "${WINEPREFIX}"/userdef.reg ]; then
+    "${PW_RUNTIME}" $PW_TERM "${WINELOADER}" wineboot -u
+fi
+########################################################################
+#if [ ! -f "${PORT_WINE_TMP_PATH}/init_run_suc" ]; then
+#    "${PW_RUNTIME}" "${port_on_run}" "init_run"
+#    if [ -f "${PORT_WINE_TMP_PATH}"/winetricks ]; then
+#        rm -f "${PORT_WINE_TMP_PATH}"/winetricks
+#    fi
+#    wget -T 3 --output-document=${PORT_WINE_TMP_PATH}/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks
+#    chmod +x "${PORT_WINE_TMP_PATH}/winetricks"
+#    PW_INIT_RUN 
+#    echo "#####################PW_INIT_RUN######################"
+#    cat "${PORT_WINE_TMP_PATH}/init_run_suc"
+#    echo "######################################################"
+#fi
+########################################################################
+cp -f "${WINEDIR}/lib/wine/fakedlls/dxgi.dll" "${WINEDIR}/lib/wine/dxgi.dll"
+cp -f "${WINEDIR}/lib64/wine/fakedlls/dxgi.dll" "${WINEDIR}/lib64/wine/dxgi.dll"
+
 ADD_IN_START_PORTWINE
 } 
 ########################################################################

data_from_portwine/scripts/setup

@@ -3,13 +3,8 @@
 . "$(dirname $(readlink -f "$0"))/runlib"
 
 rm -f "${PORT_WINE_PATH}/"*".log" 
-rm -f "${PORT_WINE_PATH}/data/"*".lock"
-
-rm -f "${config_path}/update_notifier"
-
-if [ -d "${PORT_WINE_PATH}/data/__pycache__" ]; then
-	rm -fr "${PORT_WINE_PATH}/data/__pycache__"
-fi
+rm -f "${PORT_WINE_TMP_PATH}/update_notifier"
+rm -f "${PORT_WINE_TMP_PATH}/init_run_suc"
 
 if [ ! -d "/home/${USER}/.local/share/applications" ]
 then
@@ -121,7 +116,6 @@ fi
 if [ -f "${PORT_WINE_PATH}/restart.desktop" ]; then
 	rm "${PORT_WINE_PATH}/restart.desktop"
 fi
-START_PORTWINE
-ADD_IN_POST_INSTALL
 
+update-desktop-database -q "${HOME}/.local/share/applications"
 xdg-open "http://portwine-linux.ru/portwine-faq/" > /dev/null 2>&1 & exit 0  

data_from_portwine/scripts/start

@@ -6,15 +6,15 @@ START_PORTWINE
 
 if [ ! -z "$1" ]; then
     if [ ! -z $optirun_on ]; then
-        $PW_TERM ${optirun_on} "${port_on_run}" "run" "$1"
+        "${PW_RUNTIME}" $PW_TERM ${optirun_on} "${port_on_run}" "run" "$1"
     else
-        $PW_TERM "${port_on_run}" "run" "$1"
+        "${PW_RUNTIME}" $PW_TERM "${port_on_run}" "run" "$1"
     fi
 else  
     if [ ! -z $optirun_on ]; then
-        $PW_TERM ${optirun_on} "${port_on_run}" "run" "${gamestart}" ${launch_parameters} 
+        "${PW_RUNTIME}" $PW_TERM ${optirun_on} "${port_on_run}" "run" "${gamestart}" ${launch_parameters} 
     else
-        $PW_TERM "${port_on_run}" "run" "${gamestart}" ${launch_parameters}
+        "${PW_RUNTIME}" $PW_TERM "${port_on_run}" "run" "${gamestart}" ${launch_parameters}
     fi
 fi
 

data_from_portwine/scripts/vars/PortGOG_vars

@@ -12,7 +12,7 @@ export gamestart="${PATH_TO_GAME}/GalaxyClient.exe"
 export MESA_GL_VERSION_OVERRIDE=4.4COMPAT
 export WINEDLLOVERRIDES="winemenubuilder.exe=d"
 export STAGING_SHARED_MEMORY=1
-export PW_LOG=1             # Enable debug mode fo terminal 
+export PW_LOG=0             # Enable debug mode fo terminal 
 export PW_NO_VR=1           # Disabled VR support 
 export PW_NO_D3D9=0         # Disable d3d9.dll
 export PW_NO_D3D10=0        # Disable d3d10.dll, for d3d10 games which can fall back to and run better with d3d9

data_from_portwine/scripts/vars/PortProton_vars

@@ -45,6 +45,22 @@ ADD_IN_STOP_PORTWINE ()
 echo " "
 }
 ########################################################################
+PW_INIT_RUN ()
+{
+export PW_DLL_INSTALL="vb5run vb6run vcrun6 vcrun6sp6 b1ab1ab1a"
+for dll_install in $PW_DLL_INSTALL
+do
+    echo "######################################################"
+    echo "winetricks -q --force ${dll_install}"
+    "${PW_RUNTIME}" "${PORT_WINE_TMP_PATH}/winetricks" -q --force ${dll_install} 
+    if [ $? -eq 0 ]; then
+        echo "OK: ${dll_install}" >> "${PORT_WINE_TMP_PATH}/init_run_suc"
+    else
+        echo "ERROR: ${dll_install}" >> "${PORT_WINE_TMP_PATH}/init_run_suc"
+    fi
+done
+}
+########################################################################
 ADD_IN_POST_INSTALL ()
 {
 `zenity --info --title "${inst_set_top}" --text "${inst_succ}" --no-wrap ` > /dev/null 2>&1  

data_from_portwine/scripts/winecfg

@@ -6,8 +6,8 @@ START_PORTWINE
 PW_LOG=1
 if [ ! -z ${optirun_on} ]
 then
-    $PW_TERM ${optirun_on} "${port_on_run}" "run" "winecfg" >&2
+    "${PW_RUNTIME}" $PW_TERM ${optirun_on} "${port_on_run}" "run" "winecfg" >&2
 else
-    $PW_TERM "${port_on_run}" "run" "winecfg" >&2
+    "${PW_RUNTIME}" $PW_TERM "${port_on_run}" "run" "winecfg" >&2
 fi
 STOP_PORTWINE

data_from_portwine/scripts/winecmd

 #!/bin/bash
 # Author: PortWINE-Linux.ru
 . "$(dirname $(readlink -f "$0"))/runlib"
+export PW_LOG=1
 START_PORTWINE
-PW_LOG=1
 if [ ! -z ${optirun_on} ]
 then
-    $PW_TERM '"${optirun_on}" "${port_on_run}" "run" "cmd"'
+    "${PW_RUNTIME}" $PW_TERM '"${optirun_on}" "${port_on_run}" "run" "cmd"'
 else
-    $PW_TERM '"${port_on_run}" "run" "cmd"'
+    "${PW_RUNTIME}" $PW_TERM '"${port_on_run}" "run" "cmd"'
 fi
 STOP_PORTWINE

data_from_portwine/scripts/winefile

@@ -4,15 +4,15 @@
 "${WINESERVER}" -k
 START_PORTWINE
 if [ -z "${PATH_TO_GAME}" ]; then
-    export DXVK_STATE_CACHE_PATH="${config_path}"
-    export __GL_SHADER_DISK_CACHE_PATH="${config_path}" 
-    export MESA_GLSL_CACHE_DIR="${config_path}"
+    export DXVK_STATE_CACHE_PATH="${PORT_WINE_TMP_PATH}"
+    export __GL_SHADER_DISK_CACHE_PATH="${PORT_WINE_TMP_PATH}" 
+    export MESA_GLSL_CACHE_DIR="${PORT_WINE_TMP_PATH}"
 fi
 echo "${port_deb1}" > "${PORT_WINE_PATH}/${portname}.log"
 echo "${port_deb2}" >> "${PORT_WINE_PATH}/${portname}.log"
 echo "--------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
 echo "PortWINE version:" >> "${PORT_WINE_PATH}/${portname}.log"
-read install_ver < "${config_path}/${portname}_ver"
+read install_ver < "${PORT_WINE_TMP_PATH}/${portname}_ver"
 echo "${portname}-${install_ver}" >> "${PORT_WINE_PATH}/${portname}.log"
 echo "-------------------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
 echo "var_dxvk_on = ${var_dxvk_on}" >> "${PORT_WINE_PATH}/${portname}.log"
@@ -67,14 +67,14 @@ echo "Version WINE in the Port" >> "${PORT_WINE_PATH}/${portname}.log"
 echo "-------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
 echo "log WINE" >> "${PORT_WINE_PATH}/${portname}.log"
 
-export DXVK_HUD="full"
+export DXVK_HUD="fps"
 export PW_LOG=1
 export PW_WINEDBG_DISABLE=0
 if [ ! -z ${optirun_on} ]
 then
-    $PW_TERM ${optirun_on} "${port_on_run}" "run" "explorer" >> "${PORT_WINE_PATH}/${portname}.log" 2>&1 &
+    "${PW_RUNTIME}" $PW_TERM ${optirun_on} "${port_on_run}" "run" "explorer" >> "${PORT_WINE_PATH}/${portname}.log" 2>&1 &
 else
-    $PW_TERM "${port_on_run}" "run" "explorer" >> "${PORT_WINE_PATH}/${portname}.log" 2>&1 &
+    "${PW_RUNTIME}" $PW_TERM "${port_on_run}" "run" "explorer" >> "${PORT_WINE_PATH}/${portname}.log" 2>&1 &
 fi
 zenity --info --title "DEBUG" --text "${port_debug}" --no-wrap && "${WINESERVER}" -k
 STOP_PORTWINE | pwzen
@@ -83,4 +83,4 @@ deb_text=$(cat "${PORT_WINE_PATH}/${portname}.log"  | awk '! a[$0]++')
 echo "$deb_text" > "${PORT_WINE_PATH}/${portname}.log"
 echo "$deb_text" | zenity --text-info --editable \
 --width=800 --height=600 \
---title="${portname}.log"
\ No newline at end of file
+--title="${portname}.log"

data_from_portwine/scripts/winereg

@@ -3,5 +3,5 @@
 . "$(dirname $(readlink -f "$0"))/runlib"
 "${WINESERVER}" -k
 START_PORTWINE
-$PW_TERM "${port_on_run}" "run" "regedit"
+"${PW_RUNTIME}" $PW_TERM "${port_on_run}" "run" "regedit"
 STOP_PORTWINE

data_from_portwine/scripts/winetricks-q-force

@@ -6,11 +6,12 @@ wine_pids=$(ls -l /proc/*/exe 2>/dev/null | grep -E 'wine(64)?-preloader|wineser
 if ! [ -z "${wine_pids}" ] ; then
     kill -9 ${wine_pids}
 fi
-rm -f ${PORT_SCRIPTS_PATH}/winetricks
-wget -T 3 --output-document=${PORT_SCRIPTS_PATH}/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks
-chmod +x "${PORT_SCRIPTS_PATH}/winetricks" 
-sed -i '18a . $(dirname $(readlink -f "$0"))/runlib\nSTART_PORTWINE\nexport WINELOADER="${WINEDIR}/bin/wine" ' "${PORT_SCRIPTS_PATH}/winetricks" 
-sleep 1
-export PW_LOG=1
-$PW_TERM sh "${PORT_SCRIPTS_PATH}/winetricks" -q --force
+if [ -f "${PORT_WINE_TMP_PATH}"/winetricks ]; then
+    rm -f "${PORT_WINE_TMP_PATH}"/winetricks
+fi
+wget -T 3 --output-document=${PORT_WINE_TMP_PATH}/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks
+chmod +x "${PORT_WINE_TMP_PATH}/winetricks"
+export PW_USE_TERMINAL=1
+START_PORTWINE
+"${PW_RUNTIME}" $PW_TERM "${PORT_WINE_TMP_PATH}/winetricks" -q --force
 STOP_PORTWINE

portwine_install_script/PortNAME-XX

@@ -123,8 +123,8 @@ case $SET_LANG in
 		echo "ENG" > "${PORT_WINE_PATH}/data/tmp/${portname}_loc" ;;
 esac
 if [ $? -eq 1 ];then echo "error" && exit 1; fi
-export config_path="${PORT_WINE_PATH}/data/tmp"
-read "update_loc" < "${config_path}/${portname}_loc"
+export PORT_WINE_TMP_PATH="${PORT_WINE_PATH}/data/tmp"
+read "update_loc" < "${PORT_WINE_TMP_PATH}/${portname}_loc"
 export update_loc=${update_loc}
 ########################################################################
 cd "${PORT_WINE_PATH}"