autoinstall: added spravkibk

autoinstall: correction of variables
fixed typos
2025-02-09 11:13:27 +06:00 · 2025-02-05 15:54:38 +03:00 · 2025-02-05 15:49:59 +03:00 · 2025-02-05 13:19:38 +03:00 · 2025-02-05 13:18:46 +03:00 · 2025-02-05 13:18:01 +03:00
26 changed files with 359 additions and 197 deletions
--- a/autoinstall/alta-gtd
+++ b/autoinstall/alta-gtd
@@ -1,18 +1,18 @@
 #!/usr/bin/env bash
 # info_ru: Таможенное оформление товаров
 ########################################################################
-export PP_WINE_USE="wine_x_tkg_10-0_amd64"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="alta"
 export PROG_NAME="Альта-ГТД"
 export PROG_ICON="altagtd"
 export BASE_PFX="alta_pfx_x86_v01"
-export PP_WINDOWS_VER="10"
+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"

-AUTOINSTALL_EXE="${PP_TMP_DIR}/gtdw280125.zip"
-AUTOINSTALL_UNPACK="${PP_TMP_DIR}/gtdw280125"
-AUTOINSTALL_SETUP="${PP_TMP_DIR}/gtdw280125/setup.exe"
+AUTOINSTALL_EXE="${WH_TMP_DIR}/gtdw280125.zip"
+AUTOINSTALL_UNPACK="${WH_TMP_DIR}/gtdw280125"
+AUTOINSTALL_SETUP="${WH_TMP_DIR}/gtdw280125/setup.exe"

 prepair_wine
 if try_download "https://www1.alta.ru/pub/packets/distr/gtdw280125.zip" "${AUTOINSTALL_EXE}" ; then
--- a/autoinstall/alta-tamdoc
+++ b/autoinstall/alta-tamdoc
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+# info_ru: Таможенное законодательство
+########################################################################
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
+export WINEPREFIX="alta"
+export PROG_NAME="Таможенные документы"
+export PROG_ICON="altatamdoc"
+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"
+
+AUTOINSTALL_EXE="${WH_TMP_DIR}/ordw030225.zip"
+AUTOINSTALL_UNPACK="${WH_TMP_DIR}/ordw030225"
+AUTOINSTALL_SETUP="${WH_TMP_DIR}/ordw030225/setup.exe"
+
+prepair_wine
+if try_download "https://www2.alta.ru/pub/packets/distr/ordw030225.zip" "${AUTOINSTALL_EXE}" ; then
+    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
+    try_remove_file "$AUTOINSTALL_EXE"
+
+    wine_run_install "${AUTOINSTALL_SETUP}" /S
+    try_remove_dir "$AUTOINSTALL_UNPACK"
+
+    WIN_FILE_EXEC="$DRIVE_C/ALTA/ordview.exe"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
+fi
--- a/autoinstall/alta-tax
+++ b/autoinstall/alta-tax
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+# info_ru: Расчет контракта
+########################################################################
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
+export WINEPREFIX="alta"
+export PROG_NAME="Такса"
+export PROG_ICON="altatax"
+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"
+
+AUTOINSTALL_EXE="${WH_TMP_DIR}/taxwin040225.zip"
+AUTOINSTALL_UNPACK="${WH_TMP_DIR}/taxwin040225"
+AUTOINSTALL_SETUP="${WH_TMP_DIR}/taxwin040225/setup.exe"
+
+prepair_wine
+if try_download "https://www2.alta.ru/pub/packets/distr/taxwin040225.zip" "${AUTOINSTALL_EXE}" ; then
+    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
+    try_remove_file "$AUTOINSTALL_EXE"
+
+    wine_run_install "${AUTOINSTALL_SETUP}" /S
+    try_remove_dir "$AUTOINSTALL_UNPACK"
+
+    WIN_FILE_EXEC="$DRIVE_C/ALTA/taxwin.exe"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
+fi
--- a/autoinstall/alta-zap
+++ b/autoinstall/alta-zap
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+# info_ru: Автоматизация импорта данных
+########################################################################
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
+export WINEPREFIX="alta"
+export PROG_NAME="Заполнитель"
+export PROG_ICON="altazap"
+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"
+
+AUTOINSTALL_EXE="${WH_TMP_DIR}/zapwin040225.zip"
+AUTOINSTALL_UNPACK="${WH_TMP_DIR}/zapwin040225"
+AUTOINSTALL_SETUP="${WH_TMP_DIR}/zapwin040225/setup.exe"
+
+prepair_wine
+if try_download "https://www1.alta.ru/pub/packets/distr/zapwin040225.zip" "${AUTOINSTALL_EXE}" ; then
+    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
+    try_remove_file "$AUTOINSTALL_EXE"
+
+    wine_run_install "${AUTOINSTALL_SETUP}" /S
+    try_remove_dir "$AUTOINSTALL_UNPACK"
+
+    WIN_FILE_EXEC="$DRIVE_C/ALTA/zapoln.exe"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
+fi
--- a/autoinstall/declaration2023
+++ b/autoinstall/declaration2023
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 # info_ru: Программа «Декларация 2023» позволяет автоматически формировать налоговые декларации по форме 3-НДФЛ. В процессе заполнения Вами данных программа автоматически проверяет их корректность, что уменьшает вероятность появления ошибки.
 ########################################################################
-export AUTOINSTALL_EXE="${PP_TMP_DIR}/InsD2023.msi"
-export PP_WINE_USE="wine_x_tkg_10-0_amd64"
+export AUTOINSTALL_EXE="${WH_TMP_DIR}/InsD2023.msi"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="declaration2023"
 export PROG_NAME="Декларация 2023"
 # export PROG_VERSION=""
@@ -11,7 +11,7 @@ export PROG_ICON="declarac"
 export BASE_PFX="defpfx_x86_v01"
 export WINEARCH="win32"
 export INSTALL_DLL="msxml3 msxml4 msxml6 corefonts wsh57 vcrun6 jet40 gdiplus"
-export PP_WINDOWS_VER="10"
+export WH_WINDOWS_VER="10"

 prepair_wine
 if try_download "https://data.nalog.ru/files/decl2023/1.0.3/InsD2023.msi" "${AUTOINSTALL_EXE}" ; then
--- a/autoinstall/keepsoft_simulator4
+++ b/autoinstall/keepsoft_simulator4
@@ -2,12 +2,12 @@
 # info_ru: Конструктор тестов предназначен для проведения тестирования персонала и учащихся.
 ########################################################################
 export PROG_NAME="Конструктор тестов"
-export AUTOINSTALL_EXE="${PP_TMP_DIR}/simulator4.exe"
-export PP_WINE_USE="wine_x_tkg_10-0_amd64"
+export AUTOINSTALL_EXE="${WH_TMP_DIR}/simulator4.exe"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="keepsoft_similator4"
 export BASE_PFX="defpfx_x86_v01"
 export WINEARCH="win32"
-export PP_WINDOWS_VER="10"
+export WH_WINDOWS_VER="10"

 prepair_wine
 if try_download "https://www.keepsoft.ru/download/simulator/simulator4.exe" "${AUTOINSTALL_EXE}" ; then
@@ -15,11 +15,11 @@ if try_download "https://www.keepsoft.ru/download/simulator/simulator4.exe" "${A
    try_remove_file "${AUTOINSTALL_EXE}"

    WIN_FILE_EXEC="$DRIVE_C/Program Files/Keepsoft/Simulator4/AdminResult.exe"
-    create_desktop "Конструктор тестов. Администратор результатов" "$WIN_FILE_EXEC" "simulator4_ar"
+    create_desktop "Конструктор тестов Админ" "$WIN_FILE_EXEC" "simulator4_ar"

    WIN_FILE_EXEC1="$DRIVE_C/Program Files/Keepsoft/Simulator4/DTEdit.exe"
-    create_desktop "Конструктор тестов. Редактор " "$WIN_FILE_EXEC1" "simulator4_dtedit"
+    create_desktop "Конструктор тестов Редактор" "$WIN_FILE_EXEC1" "simulator4_dtedit"

    WIN_FILE_EXEC2="$DRIVE_C/Program Files/Keepsoft/Simulator4/Simulator.exe"
-    create_desktop "Конструктор тестов. Тренажер" "$WIN_FILE_EXEC2" "simulator4_run"
+    create_desktop "Конструктор тестов Тренажер" "$WIN_FILE_EXEC2" "simulator4_run"
 fi
--- a/autoinstall/npul
+++ b/autoinstall/npul
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # info_ru: Программа автоматизации процесса подготовки юридическими и физическими лицами документов для представления в налоговые органы в электронной форме и на бумажном носителе.
 ########################################################################
-export PP_WINE_USE="wine_x_tkg_10-0_amd64"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="nalog"
 export PROG_NAME="Налогоплательщик ЮЛ"
 # export PROG_VERSION=""
@@ -10,10 +10,10 @@ export PROG_ICON="npul"
 export BASE_PFX="defpfx_x86_v01"
 export WINEARCH="win32"
 export INSTALL_DLL="msxml3 msxml4 msxml6 corefonts wsh57 vcrun6 jet40 gdiplus"
-export PP_WINDOWS_VER="10"
+export WH_WINDOWS_VER="10"


-NPUL_FILE="${PP_TMP_DIR}/npul.html"
+NPUL_FILE="${WH_TMP_DIR}/npul.html"
 curl -o "$NPUL_FILE" -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" "https://www.nalog.gov.ru/rn77/program/5961229/"

 if [[ ! -f "$NPUL_FILE" ]] \
@@ -28,8 +28,8 @@ VER_EXE=$(grep -oP 'NalogUL\K[0-9.]+(?=\.exe)' "$NPUL_FILE" | tail -n 1)
 VER_EXE_SLASH=$(grep -oP '[0-9]+\.[0-9]+\.[0-9]+/NalogUL[0-9]+\.exe' "$NPUL_FILE" | tail -n 1)
 try_remove_file "$NPUL_FILE"

-AUTOINSTALL_MSI="${PP_TMP_DIR}/NalogUL${VER_MSI}.msi"
-AUTOINSTALL_EXE="${PP_TMP_DIR}/NalogUL${VER_EXE}.exe"
+AUTOINSTALL_MSI="${WH_TMP_DIR}/NalogUL${VER_MSI}.msi"
+AUTOINSTALL_EXE="${WH_TMP_DIR}/NalogUL${VER_EXE}.exe"


 prepair_wine
--- a/autoinstall/ppdgr2
+++ b/autoinstall/ppdgr2
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 # info_ru: Подготовка документов для государственной регистрации (ППДГР)
 ########################################################################
-export AUTOINSTALL_EXE="${PP_TMP_DIR}/SetupPPDGR2.msi"
-export PP_WINE_USE="wine_x_tkg_10-0_amd64"
+export AUTOINSTALL_EXE="${WH_TMP_DIR}/SetupPPDGR2.msi"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="ppdgr2"
 export PROG_NAME="ППДГР-2"
 # export PROG_VERSION=""
@@ -11,7 +11,7 @@ export PROG_ICON="ppdgr"
 export BASE_PFX="defpfx_dn48_x86_v01"
 export WINEARCH="win32"
 export INSTALL_DLL="dotnet48 msxml3 msxml4 msxml6 corefonts lucida wsh57 vcrun6 jet40 gdiplus"
-export PP_WINDOWS_VER="10"
+export WH_WINDOWS_VER="10"
 var_winedlloverride_update "msxml4=b,wininet=b"

 prepair_wine
--- a/autoinstall/soun
+++ b/autoinstall/soun
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 # info_ru: Справочник кодов обозначения налоговых органов для целей учета налогоплательщиков
 ########################################################################
-export AUTOINSTALL_EXE="${PP_TMP_DIR}/soun_ins.exe"
-export PP_WINE_USE="wine_x_tkg_10-0_amd64"
+export AUTOINSTALL_EXE="${WH_TMP_DIR}/soun_ins.exe"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="soun"
 export PROG_NAME="СОУН"
 # export PROG_VERSION=""
@@ -11,7 +11,7 @@ export PROG_ICON="soun"
 export BASE_PFX="defpfx_x86_v01"
 export WINEARCH="win32"
 export INSTALL_DLL="corefonts"
-export PP_WINDOWS_VER="10"
+export WH_WINDOWS_VER="10"

 prepair_wine
 if try_download "https://data.nalog.ru/files/Soun/2.6.2/soun_ins.exe" "${AUTOINSTALL_EXE}" ; then
--- a/autoinstall/spravki-bk
+++ b/autoinstall/spravki-bk
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+# info_ru: «Справки БК» — специальное программное обеспечение, предназначенное для заполнения справок о доходах, расходах, об имуществе и обязательствах имущественного характера.
+########################################################################
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
+export WINEPREFIX="spravki-bk"
+export PROG_NAME="СПО Справки БК"
+export PROG_ICON="spravkibk"
+export BASE_PFX="none"
+export WH_WINDOWS_VER="10"
+export WINEARCH="win32"
+export INSTALL_DLL="msxml3 msxml6 corefonts dotnet35sp1 dotnet40 vcrun2010 jet40 gdiplus renderer=gdi mscorwks=native"
+
+AUTOINSTALL_EXE="${WH_TMP_DIR}/СПО-Справки-БК-(версия-2.5.5)-от-31.01.2024.zip"
+AUTOINSTALL_UNPACK="${WH_TMP_DIR}/SpravkiBk"
+AUTOINSTALL_SETUP="${WH_TMP_DIR}/SpravkiBk/SpravkiBk-2-5-5-2275-Internet.msi"
+
+prepair_wine
+if try_download "https://spravki-bk.ru/wp-content/uploads/СПО-Справки-БК-(версия-2.5.5)-от-31.01.2024.zip" "${AUTOINSTALL_EXE}" ; then
+    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
+    try_remove_file "$AUTOINSTALL_EXE"
+
+    wine_run_install "${AUTOINSTALL_SETUP}" /q
+    try_remove_dir "$AUTOINSTALL_UNPACK"
+
+    WIN_FILE_EXEC="$DRIVE_C/Program Files/СправкиБК/БК.exe"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
+fi
--- a/autoinstall/t-flex-cad17
+++ b/autoinstall/t-flex-cad17
@@ -2,8 +2,8 @@
 # info_ru: Профессиональная САПР, объединяющая в себе мощные параметрические возможности 2D и 3D-моделирования со средствами создания и оформления чертежей и конструкторской документации по ЕСКД.
 ########################################################################
 export PROG_NAME="T-FLEX CAD 17"
-export PP_WINDOWS_VER="10"
-export PP_WINE_USE="wine_x_tkg_10-0_amd64"
+export WH_WINDOWS_VER="10"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export BASE_PFX="tflex17_pfx_x64_v01"
 export WINEARCH="win64"
 export WINEPREFIX="tflex17"
@@ -17,9 +17,9 @@ if [[ "$BASE_PFX" == "none" ]] \
 || ! systemctl list-units --type service --state running | grep hasplmd
 then
    # Компоненты поддержки T-FLEX PLM 17 (Linux)
-    AUTOINSTALL_ZIP_LIN="${PP_TMP_DIR}/Prerequisites_T-FLEX_17_Linux.zip"
-    AUTOINSTALL_DIR_LIN="${PP_TMP_DIR}/Prerequisites_T-FLEX_17_Linux"
-    AUTOINSTALL_EXE_LIN1="${PP_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/fake_hasp.reg"
+    AUTOINSTALL_ZIP_LIN="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux.zip"
+    AUTOINSTALL_DIR_LIN="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux"
+    AUTOINSTALL_EXE_LIN1="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/fake_hasp.reg"
    if try_download "https://www.tflex.ru/downloads/Prerequisites_T-FLEX_17_Linux.zip" "${AUTOINSTALL_ZIP_LIN}" ; then
        7z x -y "${AUTOINSTALL_ZIP_LIN}" -o"${AUTOINSTALL_DIR_LIN}"
        try_remove_file "$AUTOINSTALL_ZIP_LIN"
@@ -28,11 +28,11 @@ then

    if [[ "$BASE_PFX" == "none" ]] ; then
        # Компоненты поддержки T-FLEX PLM 17 (Windows)
-        AUTOINSTALL_ZIP_WIN="${PP_TMP_DIR}/T-FLEX 17 Prerequisites.zip"
-        AUTOINSTALL_DIRWIN="${PP_TMP_DIR}"
-        AUTOINSTALL_EXE_WIN1="${PP_TMP_DIR}/Компоненты поддержки T-FLEX 17/Access Database Engine 2007/AccessDatabaseEngine.exe"
-        AUTOINSTALL_EXE_WIN_MSY="${PP_TMP_DIR}/Компоненты поддержки T-FLEX 17/Access Database Engine 2007"
-        AUTOINSTALL_EXE_WIN2="${PP_TMP_DIR}/Компоненты поддержки T-FLEX 17/TSC2/Setup_TSC2.msi"
+        AUTOINSTALL_ZIP_WIN="${WH_TMP_DIR}/T-FLEX 17 Prerequisites.zip"
+        AUTOINSTALL_DIRWIN="${WH_TMP_DIR}"
+        AUTOINSTALL_EXE_WIN1="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/Access Database Engine 2007/AccessDatabaseEngine.exe"
+        AUTOINSTALL_EXE_WIN_MSY="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/Access Database Engine 2007"
+        AUTOINSTALL_EXE_WIN2="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/TSC2/Setup_TSC2.msi"
        if try_download "https://www.tflex.ru/downloads/T-FLEX%2017%20Prerequisites.zip" "${AUTOINSTALL_ZIP_WIN}" ; then
            7z x -y "${AUTOINSTALL_ZIP_WIN}" -o"${AUTOINSTALL_DIRWIN}"
            try_remove_file "$AUTOINSTALL_ZIP_WIN"
@@ -45,13 +45,13 @@ then
        fi
        rm -fR "$DRIVE_C/Program Files/Common Files/System"
        rm -fR "$DRIVE_C/Program Files (x86)/Common Files/System"
-        cp -r "${PP_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/Program Files/Common Files/System" "$DRIVE_C/Program Files/Common Files"
-        cp -r "${PP_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/Program Files (x86)/Common Files/System" "$DRIVE_C/Program Files (x86)/Common Files"
-        mv -f "${PP_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/Windows/System32/"*.dll "$DRIVE_C/windows/system32"
+        cp -r "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/Program Files/Common Files/System" "$DRIVE_C/Program Files/Common Files"
+        cp -r "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/Program Files (x86)/Common Files/System" "$DRIVE_C/Program Files (x86)/Common Files"
+        mv -f "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/Windows/System32/"*.dll "$DRIVE_C/windows/system32"

-        "$WINELOADER" regedit "${PP_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/ado-32.reg"
-        "$WINELOADER"64 regedit "${PP_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/ado-64.reg"
-        "$WINELOADER" regedit "${PP_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/tflex.reg"
+        "$WINELOADER" regedit "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/ado-32.reg"
+        "$WINELOADER"64 regedit "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/ado-64.reg"
+        "$WINELOADER" regedit "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/tflex.reg"
    fi

    if systemctl list-units --type service --state running | grep aksusbd \
@@ -60,22 +60,22 @@ then
        print_info "Службы aksusbd и hasplmd уже запущены. Пропускаем..."
    else
        echo "#!/usr/bin/env bash
-        cd \"${PP_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/HASP_Linux/aksusbd/\"
+        cd \"${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/HASP_Linux/aksusbd/\"
        bash ./dinst
-        mv -f \"${PP_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/HASP_Linux/\"*.so /var/hasplm/
-        systemctl restart hasplmd.service" > "${PP_TMP_DIR}/tflex17_aksusbd.sh"
-        chmod +x ${PP_TMP_DIR}/tflex17_aksusbd.sh
-        su_run "${PP_TMP_DIR}/tflex17_aksusbd.sh"
-        try_remove_file "${PP_TMP_DIR}/tflex17_aksusbd.sh"
+        mv -f \"${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/HASP_Linux/\"*.so /var/hasplm/
+        systemctl restart hasplmd.service" > "${WH_TMP_DIR}/tflex17_aksusbd.sh"
+        chmod +x ${WH_TMP_DIR}/tflex17_aksusbd.sh
+        su_run "${WH_TMP_DIR}/tflex17_aksusbd.sh"
+        try_remove_file "${WH_TMP_DIR}/tflex17_aksusbd.sh"
    fi
    try_remove_dir "$AUTOINSTALL_DIR_LIN"
-    try_remove_dir "${PP_TMP_DIR}/Компоненты поддержки T-FLEX 17/"
+    try_remove_dir "${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/"
 fi

 # Программа T-FLEX CAD
-export AUTOINSTALL_ZIP="${PP_TMP_DIR}/T-FLEX CAD 17.zip"
-export AUTOINSTALL_DIR="${PP_TMP_DIR}"
-export AUTOINSTALL_EXE="${PP_TMP_DIR}/T-FLEX CAD 17/T-FLEX CAD 17.msi"
+export AUTOINSTALL_ZIP="${WH_TMP_DIR}/T-FLEX CAD 17.zip"
+export AUTOINSTALL_DIR="${WH_TMP_DIR}"
+export AUTOINSTALL_EXE="${WH_TMP_DIR}/T-FLEX CAD 17/T-FLEX CAD 17.msi"

 if try_download "https://www.tflex.ru/downloads/T-FLEX%20CAD%2017.zip" "${AUTOINSTALL_ZIP}" ; then
    7z x -y "${AUTOINSTALL_ZIP}" -o"${AUTOINSTALL_DIR}"
--- a/autoinstall/t-flex-doc17
+++ b/autoinstall/t-flex-doc17
@@ -2,8 +2,8 @@
 # info_ru: Система T-FLEX DOCs предназначена для комплексного управления инженерными данными предприятия, а также решения задач конструкторско-технологического и организационно-распорядительного документооборота.
 ########################################################################
 export PROG_NAME="T-FLEX DOCs 17"
-export PP_WINDOWS_VER="10"
-export PP_WINE_USE="wine_x_tkg_10-0_amd64"
+export WH_WINDOWS_VER="10"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export BASE_PFX="tflex17_pfx_x64_v01"
 export WINEARCH="win64"
 export WINEPREFIX="tflex17"
@@ -19,9 +19,9 @@ if [[ "$BASE_PFX" == "none" ]] \
 || ! systemctl list-units --type service --state running | grep hasplmd
 then
    # Компоненты поддержки T-FLEX PLM 17 (Linux)
-    AUTOINSTALL_ZIP_LIN="${PP_TMP_DIR}/Prerequisites_T-FLEX_17_Linux.zip"
-    AUTOINSTALL_DIR_LIN="${PP_TMP_DIR}/Prerequisites_T-FLEX_17_Linux"
-    AUTOINSTALL_EXE_LIN1="${PP_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/fake_hasp.reg"
+    AUTOINSTALL_ZIP_LIN="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux.zip"
+    AUTOINSTALL_DIR_LIN="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux"
+    AUTOINSTALL_EXE_LIN1="${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/fake_hasp.reg"
    if try_download "https://www.tflex.ru/downloads/Prerequisites_T-FLEX_17_Linux.zip" "${AUTOINSTALL_ZIP_LIN}" ; then
        7z x -y "${AUTOINSTALL_ZIP_LIN}" -o"${AUTOINSTALL_DIR_LIN}"
        try_remove_file "$AUTOINSTALL_ZIP_LIN"
@@ -30,11 +30,11 @@ then

    if [[ "$BASE_PFX" == "none" ]] ; then
        # Компоненты поддержки T-FLEX PLM 17 (Windows)
-        AUTOINSTALL_ZIP_WIN="${PP_TMP_DIR}/T-FLEX 17 Prerequisites.zip"
-        AUTOINSTALL_DIRWIN="${PP_TMP_DIR}"
-        AUTOINSTALL_EXE_WIN1="${PP_TMP_DIR}/Компоненты поддержки T-FLEX 17/Access Database Engine 2007/AccessDatabaseEngine.exe"
-        AUTOINSTALL_EXE_WIN_MSY="${PP_TMP_DIR}/Компоненты поддержки T-FLEX 17/Access Database Engine 2007"
-        AUTOINSTALL_EXE_WIN2="${PP_TMP_DIR}/Компоненты поддержки T-FLEX 17/TSC2/Setup_TSC2.msi"
+        AUTOINSTALL_ZIP_WIN="${WH_TMP_DIR}/T-FLEX 17 Prerequisites.zip"
+        AUTOINSTALL_DIRWIN="${WH_TMP_DIR}"
+        AUTOINSTALL_EXE_WIN1="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/Access Database Engine 2007/AccessDatabaseEngine.exe"
+        AUTOINSTALL_EXE_WIN_MSY="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/Access Database Engine 2007"
+        AUTOINSTALL_EXE_WIN2="${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/TSC2/Setup_TSC2.msi"
        if try_download "https://www.tflex.ru/downloads/T-FLEX%2017%20Prerequisites.zip" "${AUTOINSTALL_ZIP_WIN}" ; then
            7z x -y "${AUTOINSTALL_ZIP_WIN}" -o"${AUTOINSTALL_DIRWIN}"
            try_remove_file "$AUTOINSTALL_ZIP_WIN"
@@ -47,13 +47,13 @@ then
        fi
        rm -fR "$DRIVE_C/Program Files/Common Files/System"
        rm -fR "$DRIVE_C/Program Files (x86)/Common Files/System"
-        cp -r "${PP_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/Program Files/Common Files/System" "$DRIVE_C/Program Files/Common Files"
-        cp -r "${PP_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/Program Files (x86)/Common Files/System" "$DRIVE_C/Program Files (x86)/Common Files"
-        mv -f "${PP_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/Windows/System32/"*.dll "$DRIVE_C/windows/system32"
+        cp -r "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/Program Files/Common Files/System" "$DRIVE_C/Program Files/Common Files"
+        cp -r "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/Program Files (x86)/Common Files/System" "$DRIVE_C/Program Files (x86)/Common Files"
+        mv -f "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/Windows/System32/"*.dll "$DRIVE_C/windows/system32"

-        "$WINELOADER" regedit "${PP_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/ado-32.reg"
-        "$WINELOADER"64 regedit "${PP_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/ado-64.reg"
-        "$WINELOADER" regedit "${PP_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/tflex.reg"
+        "$WINELOADER" regedit "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/ado-32.reg"
+        "$WINELOADER"64 regedit "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/ado-64.reg"
+        "$WINELOADER" regedit "${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/Components/tflex.reg"
    fi

    if systemctl list-units --type service --state running | grep aksusbd \
@@ -62,22 +62,22 @@ then
        print_info "Службы aksusbd и hasplmd уже запущены. Пропускаем..."
    else
        echo "#!/usr/bin/env bash
-        cd \"${PP_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/HASP_Linux/aksusbd/\"
+        cd \"${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/HASP_Linux/aksusbd/\"
        bash ./dinst
-        mv -f \"${PP_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/HASP_Linux/\"*.so /var/hasplm/
-        systemctl restart hasplmd.service" > "${PP_TMP_DIR}/tflex17_aksusbd.sh"
-        chmod +x ${PP_TMP_DIR}/tflex17_aksusbd.sh
-        su_run "${PP_TMP_DIR}/tflex17_aksusbd.sh"
-        try_remove_file "${PP_TMP_DIR}/tflex17_aksusbd.sh"
+        mv -f \"${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/HASP_Linux/\"*.so /var/hasplm/
+        systemctl restart hasplmd.service" > "${WH_TMP_DIR}/tflex17_aksusbd.sh"
+        chmod +x ${WH_TMP_DIR}/tflex17_aksusbd.sh
+        su_run "${WH_TMP_DIR}/tflex17_aksusbd.sh"
+        try_remove_file "${WH_TMP_DIR}/tflex17_aksusbd.sh"
    fi
    try_remove_dir "$AUTOINSTALL_DIR_LIN"
-    try_remove_dir "${PP_TMP_DIR}/Компоненты поддержки T-FLEX 17/"
+    try_remove_dir "${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/"
 fi

 # Программа T-FLEX DOC
-AUTOINSTALL_ZIP="${PP_TMP_DIR}/T-FLEX DOCs 17 Client.zip"
-AUTOINSTALL_DIR="${PP_TMP_DIR}/T-FLEX DOCs 17"
-AUTOINSTALL_EXE="${PP_TMP_DIR}/T-FLEX DOCs 17/T-FLEX DOCs 17/T-FLEX DOCs 17.msi"
+AUTOINSTALL_ZIP="${WH_TMP_DIR}/T-FLEX DOCs 17 Client.zip"
+AUTOINSTALL_DIR="${WH_TMP_DIR}/T-FLEX DOCs 17"
+AUTOINSTALL_EXE="${WH_TMP_DIR}/T-FLEX DOCs 17/T-FLEX DOCs 17/T-FLEX DOCs 17.msi"

 if try_download "https://www.tflex.ru/downloads/DOCs/T-FLEX%20DOCs%2017%20Client.zip" "${AUTOINSTALL_ZIP}" ; then
    7z x -y "${AUTOINSTALL_ZIP}" -o"${AUTOINSTALL_DIR}"
--- a/autoinstall/tester_n
+++ b/autoinstall/tester_n
@@ -2,8 +2,8 @@
 # info_ru: Программа проверки файлов на соответствие форматам представления в электронном виде налоговых деклараций, бухгалтерской отчетности.
 ########################################################################
 export LAUNCH_PARAMETERS="/VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-"
-export AUTOINSTALL_EXE="${PP_TMP_DIR}/tester2261.exe"
-export PP_WINE_USE="wine_x_tkg_10-0_amd64"
+export AUTOINSTALL_EXE="${WH_TMP_DIR}/tester2261.exe"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="nalog"
 export PROG_NAME="Тестер"
 # export PROG_VERSION=""
@@ -12,7 +12,7 @@ export PROG_ICON="tester"
 export BASE_PFX="defpfx_x86_v01"
 export WINEARCH="win32"
 export INSTALL_DLL="msxml3 msxml4 msxml6 corefonts wsh57 vcrun6 jet40 gdiplus"
-export PP_WINDOWS_VER="10"
+export WH_WINDOWS_VER="10"

 prepair_wine
 if try_download "https://data.nalog.ru/files/tester/2.261/tester2261.exe" "${AUTOINSTALL_EXE}" ; then
--- a/autoinstall/wed-alf
+++ b/autoinstall/wed-alf
@@ -4,18 +4,18 @@
 export PROG_NAME="ВЭД-Алфавит"
 export PROG_ICON="wedalf"

-export PP_WINE_USE="wine_x_tkg_10-0_amd64"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="wed"
 export BASE_PFX="wed_pfx_x86_v02"
 export WINEARCH="win32"
-export PP_WINDOWS_VER="7"
+export WH_WINDOWS_VER="7"
 export INSTALL_DLL="vb6run art2k7min mdac27 mdac28 arial jet40 dotnet48 msxml3 msxml6 vcrun2022 wsh57 vcrun6 corefonts ie8"

 prepair_wine

-AUTOINSTALL_EXE="${PP_TMP_DIR}/setup_al.exe"
-AUTOINSTALL_UNPACK="${PP_TMP_DIR}/setup_al"
-AUTOINSTALL_SETUP="${PP_TMP_DIR}/setup_al/setup.exe"
+AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_al.exe"
+AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_al"
+AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_al/setup.exe"

 if try_download "https://ftp.ctm.ru/ALPHABET/SFX/setup_al.exe" "${AUTOINSTALL_EXE}" ; then
    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
--- a/autoinstall/wed-control
+++ b/autoinstall/wed-control
@@ -4,18 +4,18 @@
 export PROG_NAME="ВЭД-Контроль"
 export PROG_ICON="wedcontrol"

-export PP_WINE_USE="wine_x_tkg_10-0_amd64"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="wed"
 export BASE_PFX="wed_pfx_x86_v02"
 export WINEARCH="win32"
-export PP_WINDOWS_VER="7"
+export WH_WINDOWS_VER="7"
 export INSTALL_DLL="vb6run art2k7min mdac27 mdac28 arial jet40 dotnet48 msxml3 msxml6 vcrun2022 wsh57 vcrun6 corefonts ie8"

 prepair_wine

-AUTOINSTALL_EXE="${PP_TMP_DIR}/setup_cl.exe"
-AUTOINSTALL_UNPACK="${PP_TMP_DIR}/setup_cl"
-AUTOINSTALL_SETUP="${PP_TMP_DIR}/setup_cl/setup.exe"
+AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_cl.exe"
+AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_cl"
+AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_cl/setup.exe"

 if try_download "https://ftp.ctm.ru/CONTROL/SFX/setup_cl.exe" "${AUTOINSTALL_EXE}" ; then
    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
--- a/autoinstall/wed-dcl
+++ b/autoinstall/wed-dcl
@@ -4,18 +4,18 @@
 export PROG_NAME="ВЭД-Декларант"
 export PROG_ICON="weddcl"

-export PP_WINE_USE="wine_x_tkg_10-0_amd64"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="wed"
 export BASE_PFX="wed_pfx_x86_v02"
 export WINEARCH="win32"
-export PP_WINDOWS_VER="7"
+export WH_WINDOWS_VER="7"
 export INSTALL_DLL="vb6run art2k7min mdac27 mdac28 arial jet40 dotnet48 msxml3 msxml6 vcrun2022 wsh57 vcrun6 corefonts ie8"

 prepair_wine

-AUTOINSTALL_EXE="${PP_TMP_DIR}/setup_dl.exe"
-AUTOINSTALL_UNPACK="${PP_TMP_DIR}/setup_dl"
-AUTOINSTALL_SETUP="${PP_TMP_DIR}/setup_dl/setup.exe"
+AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_dl.exe"
+AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_dl"
+AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_dl/setup.exe"

 if try_download "https://ftp.ctm.ru/DCL/SFX/setup_dl.exe" "${AUTOINSTALL_EXE}" ; then
    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
--- a/autoinstall/wed-info
+++ b/autoinstall/wed-info
@@ -4,18 +4,18 @@
 export PROG_NAME="ВЭД-Инфо"
 export PROG_ICON="wedinfo"

-export PP_WINE_USE="wine_x_tkg_10-0_amd64"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="wed"
 export BASE_PFX="wed_pfx_x86_v02"
 export WINEARCH="win32"
-export PP_WINDOWS_VER="7"
+export WH_WINDOWS_VER="7"
 export INSTALL_DLL="vb6run art2k7min mdac27 mdac28 arial jet40 dotnet48 msxml3 msxml6 vcrun2022 wsh57 vcrun6 corefonts ie8"

 prepair_wine

-AUTOINSTALL_EXE="${PP_TMP_DIR}/setup_vi.exe"
-AUTOINSTALL_UNPACK="${PP_TMP_DIR}/setup_vi"
-AUTOINSTALL_SETUP="${PP_TMP_DIR}/setup_vi/setup.exe"
+AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_vi.exe"
+AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_vi"
+AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_vi/setup.exe"

 if try_download "https://ftp.ctm.ru/VEDINFO/SFX/setup_vi.exe" "${AUTOINSTALL_EXE}" ; then
    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
--- a/autoinstall/wed-pa
+++ b/autoinstall/wed-pa
@@ -4,18 +4,18 @@
 export PROG_NAME="ВЭД-Платежи"
 export PROG_ICON="wedpa"

-export PP_WINE_USE="wine_x_tkg_10-0_amd64"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="wed"
 export BASE_PFX="wed_pfx_x86_v02"
 export WINEARCH="win32"
-export PP_WINDOWS_VER="7"
+export WH_WINDOWS_VER="7"
 export INSTALL_DLL="vb6run art2k7min mdac27 mdac28 arial jet40 dotnet48 msxml3 msxml6 vcrun2022 wsh57 vcrun6 corefonts ie8"

 prepair_wine

-AUTOINSTALL_EXE="${PP_TMP_DIR}/setup_pa.exe"
-AUTOINSTALL_UNPACK="${PP_TMP_DIR}/setup_pa"
-AUTOINSTALL_SETUP="${PP_TMP_DIR}/setup_pa/setup.exe"
+AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_pa.exe"
+AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_pa"
+AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_pa/setup.exe"

 if try_download "https://ftp.ctm.ru/PAYMENT/SFX/setup_pa.exe" "${AUTOINSTALL_EXE}" ; then
    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
--- a/autoinstall/wed-rp
+++ b/autoinstall/wed-rp
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+# info_ru: Универсальная программа для создания различных отчетов, в том числе подаваемых в таможенные органы таможенными представителями.
+########################################################################
+export PROG_NAME="СТМ-Отчет"
+export PROG_ICON="wedrp"
+
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
+export WINEPREFIX="wed"
+export BASE_PFX="wed_pfx_x86_v02"
+export WINEARCH="win32"
+export WH_WINDOWS_VER="7"
+export INSTALL_DLL="vb6run art2k7min mdac27 mdac28 arial jet40 dotnet48 msxml3 msxml6 vcrun2022 wsh57 vcrun6 corefonts ie8"
+
+prepair_wine
+
+AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_rp.exe"
+AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_rp"
+AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_rp/setup.exe"
+
+if try_download "https://ftp.ctm.ru/REPORT/SFX/setup_rp.exe" "${AUTOINSTALL_EXE}" ; then
+    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
+    try_remove_file "$AUTOINSTALL_EXE"
+
+    wine_run_install "${AUTOINSTALL_SETUP}"
+    try_remove_dir "$AUTOINSTALL_UNPACK"
+
+    WIN_FILE_EXEC="$DRIVE_C/Program Files/CTM/REPORT/Report.exe"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "$PROG_ICON"
+
+    if [[ "$USE_CTMBAR" == "1" ]] ; then
+        if [[ -f "$DRIVE_C/Program Files/CTM/COMMON/CTMBAR.EXE" ]]
+        then WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/COMMON/CTMBAR.EXE"
+        elif [[ -f "$DRIVE_C/Program Files/CTM/COMMON/ctmbar.exe" ]]
+        then WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/COMMON/ctmbar.exe"
+        else WIN_FILE_EXEC1="$DRIVE_C/Program Files/CTM/Common/ctmbar.exe"
+        fi
+        create_desktop "CTM-Офис" "$WIN_FILE_EXEC1" "wedctmbar"
+    fi
+fi
--- a/autoinstall/wed-sts
+++ b/autoinstall/wed-sts
@@ -4,18 +4,18 @@
 export PROG_NAME="ВЭД-Склад"
 export PROG_ICON="wedsts"

-export PP_WINE_USE="wine_x_tkg_10-0_amd64"
+export WH_WINE_USE="wine_x_tkg_10-0_amd64"
 export WINEPREFIX="wed"
 export BASE_PFX="wed_pfx_x86_v02"
 export WINEARCH="win32"
-export PP_WINDOWS_VER="7"
+export WH_WINDOWS_VER="7"
 export INSTALL_DLL="vb6run art2k7min mdac27 mdac28 arial jet40 dotnet48 msxml3 msxml6 vcrun2022 wsh57 vcrun6 corefonts ie8"

 prepair_wine

-AUTOINSTALL_EXE="${PP_TMP_DIR}/setup_st.exe"
-AUTOINSTALL_UNPACK="${PP_TMP_DIR}/setup_st"
-AUTOINSTALL_SETUP="${PP_TMP_DIR}/setup_st/setup.exe"
+AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_st.exe"
+AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_st"
+AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_st/setup.exe"

 if try_download "https://ftp.ctm.ru/STS/SFX/setup_st.exe" "${AUTOINSTALL_EXE}" ; then
    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
--- a/image/altatamdoc.png
+++ b/image/altatamdoc.png
--- a/image/altatax.png
+++ b/image/altatax.png
--- a/image/altazap.png
+++ b/image/altazap.png
--- a/image/spravkibk.png
+++ b/image/spravkibk.png
--- a/image/wedrp.png
+++ b/image/wedrp.png
--- a/189
+++ b/189
@@ -29,14 +29,14 @@ else
    DATA_PATH="$(dirname "$RUN_SCRIPT")"
 fi

-PP_VULKAN_LIBDIR="$USER_WORK_PATH/vulkan"
-PP_PREFIXES_DIR="$USER_WORK_PATH/prefixes"
-PP_DIST_DIR="$USER_WORK_PATH/dist"
-PP_TMP_DIR="$USER_WORK_PATH/tmp"
+WH_VULKAN_LIBDIR="$USER_WORK_PATH/vulkan"
+WH_PREFIXES_DIR="$USER_WORK_PATH/prefixes"
+WH_DIST_DIR="$USER_WORK_PATH/dist"
+WH_TMP_DIR="$USER_WORK_PATH/tmp"

-PP_IMAGE_PATH="$DATA_PATH/image"
-PP_DB_DIR="$DATA_PATH/database"
-PP_AUTOINSTALL_DIR="$DATA_PATH/autoinstall"
+WH_IMAGE_PATH="$DATA_PATH/image"
+WH_DB_DIR="$DATA_PATH/database"
+WH_AUTOINSTALL_DIR="$DATA_PATH/autoinstall"

 # export WINEDLLOVERRIDES=mshtml,mscoree="

@@ -44,7 +44,7 @@ check_variables WINEESYNC "0"
 check_variables WINEFSYNC "0"

 check_variables WINEARCH "win64" # or "win32"
-check_variables PP_WINE_USE "wine_x_tkg_10-0_amd64" # or system
+check_variables WH_WINE_USE "wine_x_tkg_10-0_amd64" # or system

 check_variables STAGING_SHARED_MEMORY "1"
 check_variables WINE_LARGE_ADDRESS_AWARE "1"
@@ -55,12 +55,12 @@ check_variables WINE_ALLOW_XIM "0"

 check_variables DEBUG 0

-check_variables PP_WINDOWS_VER "10"
-# check_variables PP_USE_GSTREAMER "1"
-# check_variables PP_USE_D3D_EXTRAS "1"
-check_variables PP_USE_SHADER_CACHE "1"
-check_variables PP_USE_WINE_DXGI "0"
-check_variables PP_DLL_INSTALL ""
+check_variables WH_WINDOWS_VER "10"
+# check_variables WH_USE_GSTREAMER "1"
+# check_variables WH_USE_D3D_EXTRAS "1"
+check_variables WH_USE_SHADER_CACHE "1"
+check_variables WH_USE_WINE_DXGI "0"
+check_variables WH_DLL_INSTALL ""

 check_variables WINE_WIN_START "start /wait /high /unix"

@@ -108,8 +108,8 @@ winetricks ca-certificates cups-pdf 1>/dev/null
 then : # Зависимости установлены. Пропускаем...
 else
    if su_run "$DATA_PATH/dependencies.sh"
-    then print_info "Зависимости успешно установлены. Продолжаем работу $0"
-    else fatal "Не удалось установить зависимости. Работа $0 прервана."
+    then print_info "Зависимости успешно установлены. Продолжаем работу $SCRIPT_NAME"
+    else fatal "Не удалось установить зависимости. Работа $SCRIPT_NAME прервана."
    fi
 fi

@@ -248,7 +248,7 @@ try_download () {
            SHA256SUM_EXT=$(sha256sum "$OUTPUT_FILE" | awk '{print $1}')
            SHA256SUM_INT="$(grep "$OUTPUT_FILE_NAME" "$DATA_PATH/sha256sum.list" | awk '{print $1}')"
            if [[ "$SHA256SUM_EXT" == "$SHA256SUM_INT" ]] ; then
-                print_ok "Хэш-сумма файла $OUTPUT_FILE_NAME успешно проверенна."
+                print_ok "Хэш-сумма файла $OUTPUT_FILE_NAME успешно проверена."
                return 0
            else
                fatal "Хэш-сумма файла $OUTPUT_FILE_NAME не совподает!"
@@ -353,10 +353,10 @@ var_ld_library_path_update () {
 create_desktop () {
    local name_desktop="$1"
    local exe_file="$2"
-    local icon_file="$PP_IMAGE_PATH/$3.png"
+    local icon_file="$WH_IMAGE_PATH/$3.png"

    if [[ -z "$name_desktop" ]] || [[ -z "$exe_file" ]] ; then
-        fatal "Used: $0 --desktop \"desktop_name\" \"path_to_exe\" \"name_png_from_image\""
+        fatal "Used: $SCRIPT_NAME --desktop \"desktop_name\" \"path_to_exe\" \"name_png_from_image\""
    fi
    [[ ! -f "$exe_file" ]] && fatal "Для создания ярлыка не найден исполняемый файл: $exe_file"
    [[ ! -f "$icon_file" ]] && icon_file=wine
@@ -381,7 +381,7 @@ create_desktop () {
    if [[ "$USE_AI_SCRIPTS" == "1" ]] \
    && [[ -f "$exe_file" ]]
    then
-        grep -e "#!" -e "export" -e "var_" "$PP_AUTOINSTALL_DIR/$AI_SCRIPT" \
+        grep -e "#!" -e "export" -e "var_" "$WH_AUTOINSTALL_DIR/$AI_SCRIPT" \
        | grep -vE "LAUNCH_PARAMETERS|AUTOINSTALL|WIN_FILE_EXEC|echo" \
        | awk '{$1=$1;print}' > "$exe_file".ppdb
        print_info "Создан файл настроек для $exe_file"
@@ -406,13 +406,13 @@ init_opengl () {

 ##### CHECK VULKAN LIBRARY #####
 init_dxvk () {
-    check_variables USE_DXVK_VER "$DXVK_STABLE_VER"
+    check_variables USE_DXVK_VER "$1"

    get_dxvk () {
        DXVK_URL="$1"
-        DXVK_PACKAGE="${PP_VULKAN_LIBDIR}/dxvk-${DXVK_VAR_VER}.tar.$(echo ${DXVK_URL#*.tar.})"
+        DXVK_PACKAGE="${WH_VULKAN_LIBDIR}/dxvk-${DXVK_VAR_VER}.tar.$(echo ${DXVK_URL#*.tar.})"
        if try_download "$DXVK_URL" "$DXVK_PACKAGE" check256sum \
-        && unpack "$DXVK_PACKAGE" "$PP_VULKAN_LIBDIR"
+        && unpack "$DXVK_PACKAGE" "$WH_VULKAN_LIBDIR"
        then
            try_remove_file "$DXVK_PACKAGE"
            return 0
@@ -421,12 +421,12 @@ init_dxvk () {
    }

    for DXVK_VAR_VER in "$USE_DXVK_VER" $@ ; do
-        if [[ ! -d "${PP_VULKAN_LIBDIR}/dxvk-$DXVK_VAR_VER" ]] ; then
+        if [[ ! -d "${WH_VULKAN_LIBDIR}/dxvk-$DXVK_VAR_VER" ]] ; then
            get_dxvk "$CLOUD_URL/dxvk-${DXVK_VAR_VER}.tar.gz"
        fi
    done

-    if [[ "${PP_USE_WINE_DXGI}" == 1 ]] ; then
+    if [[ "${WH_USE_WINE_DXGI}" == 1 ]] ; then
        DXVK_FILES="d3d9 d3d10_1 d3d10 d3d11" # dxvk_config openvr_api_dxvk"
        try_copy_wine_dll_to_pfx_64 "dxgi.dll"
        try_copy_wine_dll_to_pfx_32 "dxgi.dll"
@@ -435,21 +435,21 @@ init_dxvk () {
    fi

    for dxvkfiles in $DXVK_FILES ; do
-        try_copy_other_dll_to_pfx_64 "${PP_VULKAN_LIBDIR}/dxvk-$USE_DXVK_VER/x64/$dxvkfiles.dll"
-        if try_copy_other_dll_to_pfx_32 "${PP_VULKAN_LIBDIR}/dxvk-$USE_DXVK_VER/x32/$dxvkfiles.dll"
+        try_copy_other_dll_to_pfx_64 "${WH_VULKAN_LIBDIR}/dxvk-$USE_DXVK_VER/x64/$dxvkfiles.dll"
+        if try_copy_other_dll_to_pfx_32 "${WH_VULKAN_LIBDIR}/dxvk-$USE_DXVK_VER/x32/$dxvkfiles.dll"
        then var_winedlloverride_update "$dxvkfiles=n"
        fi
    done
 }

 init_vkd3d () {
-    check_variables USE_VKD3D_VER "$VKD3D_STABLE_VER"
+    check_variables USE_VKD3D_VER "$1"

    get_vkd3d () {
        VKD3D_URL="$1"
-        VKD3D_PACKAGE="${PP_VULKAN_LIBDIR}/vkd3d-proton-${VKD3D_VAR_VER}.tar.$(echo ${VKD3D_URL#*.tar.})"
+        VKD3D_PACKAGE="${WH_VULKAN_LIBDIR}/vkd3d-proton-${VKD3D_VAR_VER}.tar.$(echo ${VKD3D_URL#*.tar.})"
        if try_download "$VKD3D_URL" "$VKD3D_PACKAGE" check256sum \
-        && unpack "$VKD3D_PACKAGE" "$PP_VULKAN_LIBDIR"
+        && unpack "$VKD3D_PACKAGE" "$WH_VULKAN_LIBDIR"
        then
            try_remove_file "$VKD3D_PACKAGE"
            return 0
@@ -458,15 +458,15 @@ init_vkd3d () {
    }

    for VKD3D_VAR_VER in "$USE_VKD3D_VER" $@ ; do
-        if [[ ! -d "${PP_VULKAN_LIBDIR}/vkd3d-proton-$VKD3D_VAR_VER" ]] ; then
+        if [[ ! -d "${WH_VULKAN_LIBDIR}/vkd3d-proton-$VKD3D_VAR_VER" ]] ; then
            get_vkd3d "$CLOUD_URL/vkd3d-proton-${VKD3D_VAR_VER}.tar.xz"
        fi
    done

    VKD3D_FILES="d3d12 d3d12core libvkd3d-shader-1 libvkd3d-1" # libvkd3d-proton-utils-3
    for vkd3dfiles in $VKD3D_FILES ; do
-        try_copy_other_dll_to_pfx_64 "${PP_VULKAN_LIBDIR}/vkd3d-proton-$USE_VKD3D_VER/x64/$vkd3dfiles.dll"
-        if try_copy_other_dll_to_pfx_32 "${PP_VULKAN_LIBDIR}/vkd3d-proton-$USE_VKD3D_VER/x86/$vkd3dfiles.dll"
+        try_copy_other_dll_to_pfx_64 "${WH_VULKAN_LIBDIR}/vkd3d-proton-$USE_VKD3D_VER/x64/$vkd3dfiles.dll"
+        if try_copy_other_dll_to_pfx_32 "${WH_VULKAN_LIBDIR}/vkd3d-proton-$USE_VKD3D_VER/x86/$vkd3dfiles.dll"
        then var_winedlloverride_update "$vkd3dfiles=n"
        fi
    done
@@ -474,12 +474,12 @@ init_vkd3d () {

 ##### DOWNLOAD WINE #####
 download_wine () {
-    if [[ ! -d "$PP_DIST_DIR/$PP_WINE_USE" ]] ; then
-        WINE_URL="$CLOUD_URL/$PP_WINE_USE.tar.xz"
-        local WINE_PACKAGE="$PP_TMP_DIR/${PP_WINE_USE}.tar.xz"
+    if [[ ! -d "$WH_DIST_DIR/$WH_WINE_USE" ]] ; then
+        WINE_URL="$CLOUD_URL/$WH_WINE_USE.tar.xz"
+        local WINE_PACKAGE="$WH_TMP_DIR/${WH_WINE_USE}.tar.xz"
        if try_download "$WINE_URL" "$WINE_PACKAGE" check256sum ; then
-            if unpack "$WINE_PACKAGE" "$PP_DIST_DIR/" ; then
-                echo "$PP_WINE_USE" > "$PP_DIST_DIR/$PP_WINE_USE/version"
+            if unpack "$WINE_PACKAGE" "$WH_DIST_DIR/" ; then
+                echo "$WH_WINE_USE" > "$WH_DIST_DIR/$WH_WINE_USE/version"
                try_remove_file "$WINE_PACKAGE"
            fi
        fi
@@ -488,8 +488,8 @@ download_wine () {

 ##### INITIAL WINE SETTINGS #####
 init_wine_ver () {
-    if [[ "$PP_WINE_USE" != system* ]] ; then
-        export WINEDIR="$PP_DIST_DIR/$PP_WINE_USE"
+    if [[ "$WH_WINE_USE" != system* ]] ; then
+        export WINEDIR="$WH_DIST_DIR/$WH_WINE_USE"

        if [[ ! -d "$WINEDIR" ]] ; then
            download_wine
@@ -523,7 +523,7 @@ init_wine_ver () {
            fi
        fi

-        [[ ! -f "${WINEDIR}/version" ]] && echo "${PP_WINE_USE}" > "${WINEDIR}/version"
+        [[ ! -f "${WINEDIR}/version" ]] && echo "${WH_WINE_USE}" > "${WINEDIR}/version"

        if [[ ! -d "${WINEDIR}/lib64/" ]] && [[ -d "${WINEDIR}/lib/wine/x86_64-unix" ]] ; then
            create_new_dir "${WINEDIR}/lib64/wine"
@@ -548,7 +548,7 @@ init_wine_ver () {
        check_variables DXVK_LOG_PATH "none"
        check_variables VKBASALT_LOG_LEVEL "none"
        check_variables DXVK_NVAPI_LOG_LEVEL "none"
-        export PP_WDBG='2>/dev/null'
+        export WH_WDBG='2>/dev/null'
    else
 #         check_variables WINEDEBUG "fixme-all,err+loaddll,err+dll,err+file,err+reg,warn+file"
        check_variables WINEDEBUG "+loaddll,+seh"
@@ -558,10 +558,10 @@ init_wine_ver () {
        check_variables VK_LOADER_DEBUG "error"
        check_variables VKBASALT_LOG_LEVEL "error"
        check_variables DXVK_NVAPI_LOG_LEVEL "error"
-        export PP_WDBG=""
+        export WH_WDBG=""
    fi

-    print_info "Используется версия wine: $PP_WINE_USE"
+    print_info "Используется версия wine: $WH_WINE_USE"
 }

 ##### INITIAL WINEPREFIX SETTINGS #####
@@ -576,7 +576,7 @@ wait_wineserver () {
 get_base_pfx () {
    local FILE_NAME_PFX="$1"
    local PFX_URL="$CLOUD_URL/${FILE_NAME_PFX}.tar.xz"
-    local PFX_TMP="$PP_TMP_DIR/pfx"
+    local PFX_TMP="$WH_TMP_DIR/pfx"
    create_new_dir "$PFX_TMP"

    if [[ ! -f "$PFX_TMP/$FILE_NAME_PFX.tar.xz" ]] ; then
@@ -595,10 +595,10 @@ get_base_pfx () {

 init_wineprefix () {
    if [[ -z "$WINEPREFIX" ]] ; then
-        export WINEPREFIX="$PP_PREFIXES_DIR/default"
+        export WINEPREFIX="$WH_PREFIXES_DIR/default"
    else
        if echo "$WINEPREFIX" | grep -v '/' ; then
-            export WINEPREFIX="$PP_PREFIXES_DIR/$WINEPREFIX"
+            export WINEPREFIX="$WH_PREFIXES_DIR/$WINEPREFIX"
        fi
    fi

@@ -622,15 +622,15 @@ init_wineprefix () {
    fi

    if [[ -f "$WINEPREFIX/system.reg" ]] \
-    && [[ -z $(grep "Windows $PP_WINDOWS_VER" "$WINEPREFIX/system.reg") ]]
+    && [[ -z $(grep "Windows $WH_WINDOWS_VER" "$WINEPREFIX/system.reg") ]]
    then
-        if [[ $(echo "$PP_WINDOWS_VER" | sed 's/.*/\L&/') == "xp" ]] \
+        if [[ $(echo "$WH_WINDOWS_VER" | sed 's/.*/\L&/') == "xp" ]] \
        && [[ "$WINEARCH" != "win32" ]]
-        then export PP_WINDOWS_VER="xp64"
+        then export WH_WINDOWS_VER="xp64"
        fi
-        env WINEDLLOVERRIDES="winegstreamer=" "$WINELOADER" winecfg -v $(echo "win${PP_WINDOWS_VER}" | sed 's/.*/\L&/')
+        env WINEDLLOVERRIDES="winegstreamer=" "$WINELOADER" winecfg -v $(echo "win${WH_WINDOWS_VER}" | sed 's/.*/\L&/')
        wait_wineserver
-        print_info "Windows версия изменена на win${PP_WINDOWS_VER}"
+        print_info "Windows версия изменена на win${WH_WINDOWS_VER}"
    fi

    if [[ -d "$DRIVE_C/users/xuser" ]] && [[ ! -d "$DRIVE_C/users/$USER" ]]
@@ -645,48 +645,48 @@ update_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 "Актуальная версия winetricks: $W_TRX_EXT_VER"
-    if [[ -f "$PP_TMP_DIR/winetricks" ]] ; then
-        W_TRX_INT_VER="$(cat "$PP_TMP_DIR/winetricks" | grep -i 'WINETRICKS_VERSION=' | sed 's/WINETRICKS_VERSION=//')"
+    if [[ -f "$WH_TMP_DIR/winetricks" ]] ; then
+        W_TRX_INT_VER="$(cat "$WH_TMP_DIR/winetricks" | grep -i 'WINETRICKS_VERSION=' | sed 's/WINETRICKS_VERSION=//')"
        print_info "Установленная портативная версия winetricks: $W_TRX_INT_VER"
    fi
    if [[ -n "$W_TRX_EXT_VER" ]] && [[ "$W_TRX_INT_VER" != "$W_TRX_EXT_VER" ]] ; then
-        if try_download "$W_TRX_URL" "$PP_TMP_DIR/winetricks_new" ; then
-            mv -f "$PP_TMP_DIR/winetricks_new" "$PP_TMP_DIR/winetricks"
-            W_TRX_INT_VER="$(cat "$PP_TMP_DIR/winetricks" | grep -i 'WINETRICKS_VERSION=' | sed 's/_VERSION=//')"
+        if try_download "$W_TRX_URL" "$WH_TMP_DIR/winetricks_new" ; then
+            mv -f "$WH_TMP_DIR/winetricks_new" "$WH_TMP_DIR/winetricks"
+            W_TRX_INT_VER="$(cat "$WH_TMP_DIR/winetricks" | grep -i 'WINETRICKS_VERSION=' | sed 's/_VERSION=//')"
            print_info "Портативная версия winetricks обновлена до (${W_TRX_INT_VER})"
-            chmod u+x "$PP_TMP_DIR/winetricks"
+            chmod u+x "$WH_TMP_DIR/winetricks"
        fi
    fi
-    export WINETRICKS="$PP_TMP_DIR/winetricks"
+    export WINETRICKS="$WH_TMP_DIR/winetricks"
 }

 use_winetricks () {
    if [[ -n "$INSTALL_DLL" ]] ; then
-        PP_DLL_INSTALL="$(echo "$INSTALL_DLL $PP_DLL_INSTALL" | awk '{ for(i=1;i<=NF;i++){a[$i]++} }END{ for(i in a){printf("%s ",i)} }' )"
+        WH_DLL_INSTALL="$(echo "$INSTALL_DLL $WH_DLL_INSTALL" | awk '{ for(i=1;i<=NF;i++){a[$i]++} }END{ for(i in a){printf("%s ",i)} }' )"
    fi
-    if [[ -n "$PP_DLL_INSTALL" ]] ; then
-        PP_DLL_NEED_INSTALL=""
+    if [[ -n "$WH_DLL_INSTALL" ]] ; then
+        WH_DLL_NEED_INSTALL=""
        USE_WT_FROM_DB=0
        [[ ! -f "$WINEPREFIX/winetricks.log" ]] && touch "$WINEPREFIX/winetricks.log"
-        for need_install_dll_to_pfx in $PP_DLL_INSTALL "isolate_home" ; do
+        for need_install_dll_to_pfx in $WH_DLL_INSTALL "isolate_home" ; do
            if [[ "$need_install_dll_to_pfx" == vcrun201[5-9] ]] ; then
                sed -i "/${need_install_dll_to_pfx}/d" "$WINEPREFIX/winetricks.log"
                need_install_dll_to_pfx="vcrun2022"
            fi
            if ! grep "$need_install_dll_to_pfx" "$WINEPREFIX/winetricks.log" &>/dev/null ; then
-                if [[ -z "$PP_DLL_NEED_INSTALL" ]]
-                then PP_DLL_NEED_INSTALL="$need_install_dll_to_pfx"
-                else PP_DLL_NEED_INSTALL="$need_install_dll_to_pfx $PP_DLL_NEED_INSTALL"
+                if [[ -z "$WH_DLL_NEED_INSTALL" ]]
+                then WH_DLL_NEED_INSTALL="$need_install_dll_to_pfx"
+                else WH_DLL_NEED_INSTALL="$need_install_dll_to_pfx $WH_DLL_NEED_INSTALL"
                fi
                USE_WT_FROM_DB=1
            fi
        done
        if [[ "$USE_WT_FROM_DB" == "1" ]] ; then
            if update_winetricks ; then
-                print_info "Пробуем установить библиотеки: ${PP_DLL_NEED_INSTALL}"
+                print_info "Пробуем установить библиотеки: ${WH_DLL_NEED_INSTALL}"
                print_info "Запускаем WINETRICKS..."
                export WINETRICKS_DOWNLOADER="curl"
-                env WINEDLLOVERRIDES="winegstreamer=" "$PP_TMP_DIR/winetricks" -q ${PP_DLL_NEED_INSTALL}
+                env WINEDLLOVERRIDES="winegstreamer=" "$WH_TMP_DIR/winetricks" -q ${WH_DLL_NEED_INSTALL}
                wait_wineserver
            fi
        fi
@@ -711,12 +711,12 @@ init_database () {
        else
            orig_IFS="$IFS"
            IFS=$'\n'
-            PP_FIND_DB_FILE="$(grep -ilw "#$PPDB.exe" "$PP_DB_DIR"/* )"
-            if [[ $(echo "$PP_FIND_DB_FILE" | wc -l) -gt 1 ]] ; then
+            WH_FIND_DB_FILE="$(grep -ilw "#$PPDB.exe" "$WH_DB_DIR"/* )"
+            if [[ $(echo "$WH_FIND_DB_FILE" | wc -l) -gt 1 ]] ; then
                print_error "Найдено более одного файла настроек: $PPDB.exe"
-                PPDB_FILE="$(echo "$PP_FIND_DB_FILE" | head -n1)"
+                PPDB_FILE="$(echo "$WH_FIND_DB_FILE" | head -n1)"
            else
-                PPDB_FILE="$PP_FIND_DB_FILE"
+                PPDB_FILE="$WH_FIND_DB_FILE"
            fi
            IFS="$orig_IFS"
        fi
@@ -741,14 +741,14 @@ prepair_wine () {
    if init_opengl ; then
        [[ "$MANGOHUD" == 1 ]] && MANGOHUD_RUN="mangohud --dlsym"
    else
-        init_dxvk
-        init_vkd3d
+        init_dxvk "$DXVK_STABLE_VER"
+        init_vkd3d "$VKD3D_STABLE_VER"
        [[ "$MANGOHUD" == 1 ]] && MANGOHUD_RUN="mangohud"
    fi
 }

 wine_run () {
-    print_var WINEPREFIX WINEDLLOVERRIDES PP_WINDOWS_VER
+    print_var WINEPREFIX WINEDLLOVERRIDES WH_WINDOWS_VER
    WIN_FILE_PATH="$(dirname "$WIN_FILE_EXEC")"
    [[ -d "$WIN_FILE_PATH" ]] && cd "$WIN_FILE_PATH"

@@ -770,29 +770,44 @@ run_autoinstall () {
    AI_SCRIPT="${1,,}"
    if [[ $AI_SCRIPT == "list" ]] || [[ -z "$AI_SCRIPT" ]] ; then
        print_info "Список программ с возможностью автоматической установки:"
-        for list in $(ls "$PP_AUTOINSTALL_DIR") ; do
-            AI_INFO="$(grep "info_ru:" "$PP_AUTOINSTALL_DIR/$list" | awk -F"info_ru: " '{print $2}')"
-            AI_PROGNAME="$(grep "PROG_NAME=" "$PP_AUTOINSTALL_DIR/$list" | awk -F"PROG_NAME=" '{print $2}')"
+        for list in $(ls "$WH_AUTOINSTALL_DIR") ; do
+            AI_INFO="$(grep "info_ru:" "$WH_AUTOINSTALL_DIR/$list" | awk -F"info_ru: " '{print $2}')"
+            AI_PROGNAME="$(grep "PROG_NAME=" "$WH_AUTOINSTALL_DIR/$list" | awk -F"PROG_NAME=" '{print $2}')"
            printf "\E[36m%s $SCRIPT_NAME install $list  -  $AI_PROGNAME %s\e[0m\n"
            echo -e "$AI_INFO\n"
        done
        echo
-    elif [[ -f "$PP_AUTOINSTALL_DIR/$AI_SCRIPT" ]] ; then
+    elif [[ -f "$WH_AUTOINSTALL_DIR/$AI_SCRIPT" ]] ; then
        export USE_AI_SCRIPTS="1"
-        source "$PP_AUTOINSTALL_DIR/$AI_SCRIPT"
+        source "$WH_AUTOINSTALL_DIR/$AI_SCRIPT"
        print_info "Завершена установка $AI_SCRIPT"
    else
        fatal "Скрипт автоматической установки для $AI_SCRIPT не найден!"
    fi
 }

+wh_info () {
+    echo "Использование: $SCRIPT_NAME [команда]
+
+Команды:
+    install|-i [скрипт установки]              если без аргументов, то выводит список возможных установочных скриптов
+
+Параметры:
+    --help                                     показать эту справку и выйти
+    --version                                  показать информацию о пакете и его версии
+
+"
+}
+
 ##### MAIN #####
-create_new_dir "$PP_TMP_DIR"
-create_new_dir "$PP_DIST_DIR"
-create_new_dir "$PP_PREFIXES_DIR"
-create_new_dir "$PP_VULKAN_LIBDIR"
+create_new_dir "$WH_TMP_DIR"
+create_new_dir "$WH_DIST_DIR"
+create_new_dir "$WH_PREFIXES_DIR"
+create_new_dir "$WH_VULKAN_LIBDIR"

 case "${1,,}" in
+    --version) rpm -qi "$SCRIPT_NAME" ; exit 0 ;;
+    --help) wh_info ; exit 0 ;;
    killall) kill_wine ;;
    winecfg) prepair_wine ; wine_run "winecfg" ;;
    winereg|regedit) prepair_wine ; wine_run "regedit" ;;
@@ -800,7 +815,7 @@ case "${1,,}" in
    wineconsole|cmd) prepair_wine ; wine_run "wineconsole" ;;
    winetricks) shift ; update_winetricks ; prepair_wine ; "$WINETRICKS" -q "$@" ;;
    desktop) shift ; create_desktop "$@" ; exit 0 ;;
-    install|autoinstall|-ai) shift ; run_autoinstall "$1" ;;
+    install|-i) shift ; run_autoinstall "$1" ;;
    *)
        if [[ -f "$1" ]] ; then
            WIN_FILE_EXEC="$(readlink -f "$1")"
@@ -813,8 +828,8 @@ case "${1,,}" in
                *) fatal "Тип файла не поддерживается." ;;
            esac
        else
-            print_info "Делать нечего... Выходим."
-            exit 0
+            wh_info
+            exit 1
        fi
        ;;
 esac
Author	SHA1	Message	Date
Sergey Palcheh	1368e7b31f	autoinstall: added spravkibk	2025-02-09 11:13:27 +06:00
Mikhail Tergoev	7a2fddb5c0	autoinstall: correction of variables	2025-02-05 15:54:38 +03:00
Mikhail Tergoev	a141541079	fixed typos	2025-02-05 15:49:59 +03:00
Mikhail Tergoev	253c3f59c8	autoinstall: added alta-zap	2025-02-05 13:19:38 +03:00
Mikhail Tergoev	bc58beb5dd	autoinstall: added alta-tax	2025-02-05 13:18:46 +03:00
Mikhail Tergoev	88e588dc18	autoinstall: added alta-tamdoc	2025-02-05 13:18:01 +03:00
Mikhail Tergoev	eb98c676d1	autoinstall: added wedrp	2025-02-05 13:16:44 +03:00
Mikhail Tergoev	831a75622d	added minimal help info	2025-02-02 17:11:47 +03:00
Mikhail Tergoev	c56801b47e	updated init_dxvk and init_vkd3d	2025-02-02 16:05:58 +03:00
Mikhail Tergoev	24043d0772	replace PP_ to WH_ in the naming variables	2025-02-02 15:59:28 +03:00
Mikhail Tergoev	336f3a8ed7	autoinstall: updated desktop name for keepsoft_similator4	2025-02-01 18:33:10 +03:00