updated variables for last.conf and .whdb

autoinstall/ved-control

@@ -16,11 +16,11 @@ prepair_wine
 # фикс постоянного запроса обновления Windows
 get_and_set_reg_file --add 'Software\CTM\CTMSETUP' 'SkipKBCheck' 'REG_DWORD' "1" "userdef"
 
-AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_cl.exe"
-AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_cl"
-AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_cl/setup.exe"
+AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_ct.exe"
+AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_ct"
+AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_ct/setup.exe"
 
-if try_download "https://ftp.ctm.ru/CONTROL/SFX/setup_cl.exe" "${AUTOINSTALL_EXE}" ; then
+if try_download "https://ftp.ctm.ru/CONTROL/SFX/setup_ct.exe" "${AUTOINSTALL_EXE}" ; then
     unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
     try_remove_file "$AUTOINSTALL_EXE"
 

sha256sum.list

@@ -2,6 +2,7 @@
 e9a8b79dfe12cad1304dca573d73aefe109e3d69b6fff739c8dbb8b2d3c271c6  wine-10.12.1-alt1-wow64.tar.xz
 a862761c432f8619caf8100589678a1cbb523787259120ccd4388089d81e3b17  wine-10.18.1-tflex-alt2-wow64.tar.xz
 349c707148a23e667970309248bbbf97b4e2a0db59c548e73d9fe9c3f585872c  wine-10.18.1-alt1-wow64.tar.xz
+49d04a3a02e1ce66ed978d731fd0933d4fdcc1906fa1cb0de716ee20fd6cb451  wine-10.18.1-alt2-wow64.tar.xz
 
 ##### WINE AMD64 #####
 009c95bfe2df3f9264c9c5092f3e30ea7a168dd7869046058a718a70739602d4  wine_wh_tflex_10-9_amd64.tar.xz

testinstall/ksamu

@@ -2,7 +2,7 @@
 # info_ru: “КСАМУ” - Комплексная система автоматизации медицинского учреждения.
 ########################################################################
 export PROG_URL="https://docs.medicine-it.ru/"
-export WH_WINE_USE="wine-10.18.1-alt1-wow64"
+export WH_WINE_USE="wine-10.18.1-alt2-wow64"
 export WINEPREFIX="ksamu"
 export PROG_NAME="КСАМУ"
 export PROG_ICON="ksamu"
@@ -14,8 +14,9 @@ export WH_WINDOWS_VER="7"
 export WH_USE_CPCSP_PROXY="1"
 export WH_USE_CPCSP_CADES="0"
 export WINE_D3D_CONFIG="renderer=gdi"
-export WH_MAIN_DECORATED="0"
+export WH_MAIN_DECORATED="1"
 export WH_VIRTUAL_DESKTOP="0"
+export WINE_TOP_WINDOW="Открыть"
 
 prepair_wine
 create_desktop "$PROG_NAME" "$DRIVE_C/KSAMU/KSAMU.exe" "$PROG_ICON"

winehelper

@@ -721,8 +721,10 @@ EOF
         } > "$exe_file".whdb
 
         grep -e "info_" -e "#####" -e "PROG_URL=" -e "WINEPREFIX=" -e "INSTALL_DLL=" \
-             -e "PROG_NAME=" -e "PROG_ICON=" -e "var_" "$INSTALL_SCRIPT" \
-        | awk '{$1=$1;print}' >> "$exe_file".whdb
+             -e "PROG_NAME=" -e "PROG_ICON=" -e "var_" -e "WH_MAIN_DECORATED" \
+             -e "WH_VIRTUAL_DESKTOP" -e "WINE_TOP_WINDOW" -e "WH_FONT_SMOOTHING "\
+             -e "WH_FONT_MSS_REPLACE" \
+             "$INSTALL_SCRIPT" | awk '{$1=$1;print}' >> "$exe_file".whdb
 
         print_info "Создан файл настроек для $exe_file"
     fi
@@ -1411,7 +1413,7 @@ init_wineprefix () {
     for var in WH_WINE_USE BASE_PFX WINEARCH WH_WINDOWS_VER WINEESYNC WINEFSYNC \
     STAGING_SHARED_MEMORY WINE_LARGE_ADDRESS_AWARE WH_USE_SHADER_CACHE WH_USE_WINE_DXGI \
     WINE_CPU_TOPOLOGY DXVK_VER VKD3D_VER WH_XDG_OPEN WH_USE_MESA_GL_OVERRIDE \
-    WH_USE_CPCSP_PROXY
+    WH_USE_CPCSP_PROXY WH_USE_EXTRA_FONTS
     do
         echo "export $var=\"${!var}\"" >> "$WINEPREFIX/last.conf"
     done