Merge branch 'minergenon-alta-expert'

autoinstall/alta-expert

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+# info_ru: Пакет программ для таможенного оформления. Включает программы Такса и ТамДок в комплектациях Эксперт, а также программу Заполнитель.
+########################################################################
+export WH_AUTOINSTALL="1"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
+export WINEPREFIX="alta"
+export PROG_NAME="Альта-Эксперт"
+export BASE_PFX="alta_pfx_x86_v01"
+export WH_WINDOWS_VER="10"
+export WINEARCH="win32"
+export INSTALL_DLL="corefonts eufonts lucida opensymbol tahoma cjkfonts vb6run mdac28 msxml3 msxml4 msxml6 mfc42 jet40 native_oleaut32"
+
+ALTA_VERSION="230325"
+AUTOINSTALL_EXE="${WH_TMP_DIR}/expert${ALTA_VERSION}.zip"
+AUTOINSTALL_UNPACK="${WH_TMP_DIR}/expert${ALTA_VERSION}"
+AUTOINSTALL_SETUP="${WH_TMP_DIR}/expert${ALTA_VERSION}/setup.exe"
+
+prepair_wine
+if try_download "https://www1.alta.ru/pub/packets/distr/expert${ALTA_VERSION}.zip" "${AUTOINSTALL_EXE}" ; then
+    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
+    try_remove_file "$AUTOINSTALL_EXE"
+
+    wine_run_install "${AUTOINSTALL_SETUP}" /S /OVERWRITE
+    try_remove_dir "$AUTOINSTALL_UNPACK"
+
+    ALTA_PATH="$DRIVE_C/ALTA"
+    create_desktop "Таможенные документы" "$ALTA_PATH/ordview.exe" "altatamdoc"
+    create_desktop "Такса" "$ALTA_PATH/taxwin.exe" "altatax"
+    create_desktop "Заполнитель" "$ALTA_PATH/zapoln.exe" "altazap"
+fi

autoinstall/scada-krug-2000

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+# info_ru: Это мощный, современный инструмент быстрой и качественной разработки АСУТП
+########################################################################
+export WH_AUTOINSTALL="1"
+export WH_WINE_USE="wine-9.0.9-alt1-i586"
+export WINEPREFIX="scada-krug-2000"
+export PROG_NAME="SCADA КРУГ 2000"
+export PROG_ICON="krugtaskmanager"
+export BASE_PFX="none"
+export WH_WINDOWS_VER="10"
+export WINEARCH="win32"
+export INSTALL_DLL="dotnet48 vcrun6 vcrun2008 vcrun2022 d3dcompiler_47 mdac28 corefonts riched20 wsh57"
+export USE_RENDERER="proton"
+
+if [[ -f "$2" ]] ; then
+    prepair_wine
+
+    wine_run_install "$2" /quiet /exit
+
+    WIN_FILE_EXEC="$DRIVE_C/Program Files/Krug2000/Bin/KrugTaskManager.exe"
+    # TODO: Если файл не найден, использовать автопоиск по имени exe файла $WIN_FILE_EXEC
+    create_desktop "Менеджер задач" "$WIN_FILE_EXEC" "$PROG_ICON"
+else
+    fatal "Не найден файл установки для $PROG_NAME. Перезапустите по примеру:
+    winehelper install $1 \"/путь/до/установочного_файла\""
+fi

sha256sum.list

@@ -2,6 +2,15 @@
 
 71d6fdfd23d7988471d345c68e81699b8af931352b03dd216424b398f63c7b12  wine_x_tkg_10-0_amd64.tar.xz
 fb7fdfde96de10a1b3b051bdf2727b6a7c1768b878483726454dd6726e9e0193  wine-9.0.14-alt1-i586-spravkibk.tar.xz
+6f86d2220b65b709bf88c6f829a4998de3b929cc2091cd1333a51c32e1491b79  wine-9.0.9-alt1-i586.tar.xz
+
+##### DXVK #####
+
+98411effbc1b3611b11c4ca3af2ad29400b08e1c8c380791d6351600a06fb3c7  dxvk-1.10.3-28.tar.xz
+
+##### VKD3D #####
+
+df1a940d2e072a884524f66a16e0f0ef74048bc6a6642b96eb257528a522109f  vkd3d-proton-1.1-2602.tar.xz
 
 ##### PREFIX #####
 

winehelper

@@ -74,16 +74,14 @@ check_variables WH_DLL_INSTALL ""
 
 check_variables WINE_WIN_START "start /wait /high /unix"
 
-check_variables WINE_CPU_TOPOLOGY "4"
+check_variables WINE_CPU_TOPOLOGY "8"
 
-check_variables USE_OPENGL "1"
+check_variables USE_RENDERER "opengl" # opengl, damavand, proton
 
-check_variables DXVK_STABLE_VER "1.10.3-28"
+check_variables DXVK_VER "1.10.3-28"
-check_variables DXVK_GIT_VER "2.2-164"
 # check_variables DXVK_CONFIG_FILE "path/to/dxvk.conf"
 
-check_variables VKD3D_STABLE_VER "1.1-2602"
+check_variables VKD3D_VER "1.1-2602"
-check_variables VKD3D_GIT_VER "1.1-3556"
 # check_variables VKD3D_LIMIT_TESS_FACTORS 64
 # check_variables VKD3D_FEATURE_LEVEL "12_0"
 
@@ -455,14 +453,17 @@ run_installed_programs () {
 }
 
 ##### USED WINED3D LIBRARY #####
-init_opengl () {
+init_wined3d () {
-    if [[ "$USE_OPENGL" == 1 ]] ; then
+    if [[ "$USE_RENDERER" != "proton" ]] ; then
-        WINED3D_FILES="d3d8 d3d9 d3d10_1 d3d10 d3d10core d3d11 dxgi d3d12" # d3d12core
+        WINED3D_FILES="d3d8 d3d9 d3d10_1 d3d10 d3d10core d3d11 dxgi d3d12 d3d12core"
         for wined3dfiles in $WINED3D_FILES ; do
             try_copy_wine_dll_to_pfx_64 "$wined3dfiles.dll"
             try_copy_wine_dll_to_pfx_32 "$wined3dfiles.dll"
         done
-        # check_variables WINE_D3D_CONFIG "renderer="
+        if [[ "$USE_RENDERER" == "damavand" ]]
+        then export WINE_D3D_CONFIG="renderer=vulkan"
+        else export WINE_D3D_CONFIG="renderer=gl"
+        fi
         return 0
     else
         return 1
@@ -487,7 +488,7 @@ init_dxvk () {
 
     for DXVK_VAR_VER in "$USE_DXVK_VER" $@ ; do
         if [[ ! -d "${WH_VULKAN_LIBDIR}/dxvk-$DXVK_VAR_VER" ]] ; then
-            get_dxvk "$CLOUD_URL/dxvk-${DXVK_VAR_VER}.tar.gz"
+            get_dxvk "$CLOUD_URL/dxvk-${DXVK_VAR_VER}.tar.xz"
         fi
     done
 
@@ -825,14 +826,13 @@ prepair_wine () {
     init_wineprefix
     use_winetricks
 
-    unset MANGOHUD_RUN
+    if init_wined3d ; then
-    if init_opengl ; then
+        :
-        [[ "$MANGOHUD" == 1 ]] && MANGOHUD_RUN="mangohud --dlsym"
     else
-        init_dxvk "$DXVK_STABLE_VER"
+        init_dxvk "$DXVK_VER"
-        init_vkd3d "$VKD3D_STABLE_VER"
+        init_vkd3d "$VKD3D_VER"
-        [[ "$MANGOHUD" == 1 ]] && MANGOHUD_RUN="mangohud"
     fi
+    [[ "$MANGOHUD" == 1 ]] && MANGOHUD_RUN="mangohud"
 }
 
 wine_run () {
@@ -880,7 +880,7 @@ run_autoinstall () {
         echo
     elif [[ -f "$WH_AUTOINSTALL_DIR/$AI_SCRIPT" ]] ; then
         export USE_AI_SCRIPTS="1"
-        source "$WH_AUTOINSTALL_DIR/$AI_SCRIPT"
+        source "$WH_AUTOINSTALL_DIR/$AI_SCRIPT" "$@"
         print_info "Завершена установка $AI_SCRIPT"
     else
         fatal "Скрипт автоматической установки для $AI_SCRIPT не найден!"