Scripts version 2104

data_from_portwine/changelog_eng

@@ -2,6 +2,10 @@ You can help us in the development of the project on the website: boosty.to/port
 -----------------------------------------
 Changelog:
 
+###Scripts version 2104###
+* HOTFIX - download and update winetricks
+* when creating a log, all d3dx* and d3dcomp* were removed for readability
+
 ###Scripts version 2103###
 * updated container launch mode
 * temporary variable PW_USE_AMDVLK_DRIVER does not work

data_from_portwine/changelog_rus

@@ -2,6 +2,10 @@
 -----------------------------------------
 История изменений:
 
+###Scripts version 2104###
+* HOTFIX - скачивание и обновление winetricks
+* при создании лога убраны все d3dx* и d3dcomp* для удобства чтения
+
 ###Scripts version 2103###
 * обновлен режим запуска контейнера
 * временно переменная PW_USE_AMDVLK_DRIVER не работает 

data_from_portwine/scripts/functions_helper

@@ -783,7 +783,7 @@ pw_port_update () {
 
 
 update_winetricks () {
-    W_TRX_URL="raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks"
+    W_TRX_URL="https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks"
     W_TRX_EXT_VER="$(curl -s --list-only ${W_TRX_URL} | grep -i 'WINETRICKS_VERSION=' | sed 's/WINETRICKS_VERSION=//')"
     print_info "Version winetricks on server: ${W_TRX_EXT_VER}"
     W_TRX_INT_VER="$(cat "${PORT_WINE_TMP_PATH}/winetricks" | grep -i 'WINETRICKS_VERSION=' | sed 's/WINETRICKS_VERSION=//')"

data_from_portwine/scripts/start.sh

@@ -141,10 +141,9 @@ portwine_start_debug () {
     then echo "D3D_EXTRAS - disabled" >> "${PORT_WINE_PATH}/${portname}.log"
     else echo "D3D_EXTRAS - enabled" >> "${PORT_WINE_PATH}/${portname}.log"
     fi
-    echo 
     echo "------------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
-    echo "winetricks.log:" | grep -v 'd3dcomp|d3dx' >> "${PORT_WINE_PATH}/${portname}.log"
+    echo "winetricks.log:" >> "${PORT_WINE_PATH}/${portname}.log"
-    cat "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log" >> "${PORT_WINE_PATH}/${portname}.log"
+    cat "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log" | sed -e /"^d3dcomp*"/d -e /"^d3dx*"/d >> "${PORT_WINE_PATH}/${portname}.log"
     echo "-----------------------------------------" >> "${PORT_WINE_PATH}/${portname}.log"
     if [ ! -z "${PORTWINE_DB_FILE}" ]; then
         echo "Use ${PORTWINE_DB_FILE} db file:" >> "${PORT_WINE_PATH}/${portname}.log"
@@ -224,9 +223,12 @@ pw_prefix_manager () {
     if [ ! -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log" ] ; then
         touch "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log"
     fi
-    [[ ! -f "${PORT_WINE_TMP_PATH}/dll_list" ]] && "${PORT_WINE_TMP_PATH}/winetricks" dlls list | awk -F'(' '{print $1}' 1> "${PORT_WINE_TMP_PATH}/dll_list"
+
-    [[ ! -f "${PORT_WINE_TMP_PATH}/fonts_list" ]] && "${PORT_WINE_TMP_PATH}/winetricks" fonts list | awk -F'(' '{print $1}' 1> "${PORT_WINE_TMP_PATH}/fonts_list"
+    pw_start_progress_bar_block "Starting prefix manager..."
-    [[ ! -f "${PORT_WINE_TMP_PATH}/settings_list" ]] && "${PORT_WINE_TMP_PATH}/winetricks" settings list | awk -F'(' '{print $1}' 1> "${PORT_WINE_TMP_PATH}/settings_list"
+    "${PORT_WINE_TMP_PATH}/winetricks" dlls list | awk -F'(' '{print $1}' 1> "${PORT_WINE_TMP_PATH}/dll_list"
+    "${PORT_WINE_TMP_PATH}/winetricks" fonts list | awk -F'(' '{print $1}' 1> "${PORT_WINE_TMP_PATH}/fonts_list"
+    "${PORT_WINE_TMP_PATH}/winetricks" settings list | awk -F'(' '{print $1}' 1> "${PORT_WINE_TMP_PATH}/settings_list"
+    pw_stop_progress_bar
 
     gui_prefix_manager () {
         pw_start_progress_bar_block "Starting prefix manager..."
@@ -287,6 +289,7 @@ pw_prefix_manager () {
         fi 
         try_remove_file  "${PORT_WINE_TMP_PATH}/dll_list_tmp"
         try_remove_file  "${PORT_WINE_TMP_PATH}/fonts_list_tmp"
+        try_remove_file  "${PORT_WINE_TMP_PATH}/settings_list_tmp"
 
         for STPFXMNG in `cat "${PORT_WINE_TMP_PATH}/to_winetricks"` ; do
             grep `echo ${STPFXMNG} | awk -F'|' '{print $2}'` "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log" &>/dev/null

data_from_portwine/scripts/var

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #Author: Castro-Fidel (PortWINE-Linux.ru)
-#SCRIPTS_NEXT_VERSION=2103
+#SCRIPTS_NEXT_VERSION=2104
 ########################################################################
 export PW_MANGOHUD=0
 export MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,gpu_color=2e9762,gpu_text=GPU,vram,vram_color=ad64c1,ram,ram_color=c26693,io_color=a491d3,frame_timing=1,frametime_color=00ff00,time,arch,wine,wine_color=eb5b5b,engine_color=eb5b5b,background_alpha=0.2,font_size=24,background_color=020202,text_color=ffffff,toggle_hud=Shift_R+F12,resolution,vkbasalt