t-flex-cad: updated all scripts

CHANGELOG

@@ -1,5 +1,11 @@
 История изменений:
 
+0.4.3:
+* исправлено обновление префикса при первом запуске
+
+0.4.2:
+* исправлено создание и восстановление резервных копий с разными именами пользователей
+
 0.4.1:
 * добавлена возможность создания резервной копии префикса:
     winehelper backup-prefix [имя_префикса]

autoinstall/alta-expert

@@ -16,7 +16,7 @@ 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}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
     try_remove_file "$AUTOINSTALL_EXE"
 
     wine_run_install "${AUTOINSTALL_SETUP}" /S /OVERWRITE

autoinstall/alta-gtd

@@ -16,7 +16,7 @@ AUTOINSTALL_SETUP="${WH_TMP_DIR}/gtdw280125/setup.exe"
 
 prepair_wine
 if try_download "https://www2.alta.ru/pub/packets/distr/gtdw280125.zip" "${AUTOINSTALL_EXE}" ; then
-    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
     try_remove_file "$AUTOINSTALL_EXE"
 
     wine_run_install "${AUTOINSTALL_SETUP}" /S /OVERWRITE

autoinstall/alta-maximum

@@ -16,7 +16,7 @@ AUTOINSTALL_SETUP="${WH_TMP_DIR}/maximum${ALTA_VERSION}/setup.exe"
 
 prepair_wine
 if try_download "https://www2.alta.ru/pub/packets/distr/maximum${ALTA_VERSION}.zip" "${AUTOINSTALL_EXE}" ; then
-    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
     try_remove_file "$AUTOINSTALL_EXE"
 
     wine_run_install "${AUTOINSTALL_SETUP}" /S /OVERWRITE

autoinstall/alta-tamdoc

@@ -16,7 +16,7 @@ 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}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
     try_remove_file "$AUTOINSTALL_EXE"
 
     wine_run_install "${AUTOINSTALL_SETUP}" /S /OVERWRITE

autoinstall/alta-tax

@@ -16,7 +16,7 @@ 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}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
     try_remove_file "$AUTOINSTALL_EXE"
 
     wine_run_install "${AUTOINSTALL_SETUP}" /S /OVERWRITE

autoinstall/alta-zap

@@ -16,7 +16,7 @@ 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}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
     try_remove_file "$AUTOINSTALL_EXE"
 
     wine_run_install "${AUTOINSTALL_SETUP}" /S /OVERWRITE

autoinstall/ctm-finance

@@ -18,7 +18,7 @@ AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_fn"
 AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_fn/setup.exe"
 
 if try_download "https://files.ctm.ru/FINANCE/SFX/setup_fn.exe" "${AUTOINSTALL_EXE}" ; then
-    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
     try_remove_file "$AUTOINSTALL_EXE"
 
     wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\CTM\\\\FINANCE" /auto /hide

autoinstall/ctm-journals

@@ -18,7 +18,7 @@ AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_jr"
 AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_jr/setup.exe"
 
 if try_download "https://files.ctm.ru/JOURNALS/SFX/setup_jr.exe" "${AUTOINSTALL_EXE}" ; then
-    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
     try_remove_file "$AUTOINSTALL_EXE"
 
     wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\CTM\\\\JOURNALS" /auto /hide

autoinstall/ctm-monitor

@@ -18,7 +18,7 @@ AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_me"
 AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_me/setup.exe"
 
 if try_download "https://files.ctm.ru/MONITOR_ED/SFX/setup_me.exe" "${AUTOINSTALL_EXE}" ; then
-    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
     try_remove_file "$AUTOINSTALL_EXE"
 
     wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\CTM\\\\MONITOR_ED" /auto /hide

autoinstall/ctm-report

@@ -18,7 +18,7 @@ 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}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
     try_remove_file "$AUTOINSTALL_EXE"
 
     wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\CTM\\\\REPORT" /auto /hide

autoinstall/ctm-service

@@ -18,7 +18,7 @@ AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_cs"
 AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_cs/setup.exe"
 
 if try_download "https://files.ctm.ru/CSERVICE/SFX/setup_cs.exe" "${AUTOINSTALL_EXE}" ; then
-    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
     try_remove_file "$AUTOINSTALL_EXE"
 
     wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\CTM\\\\CSERVICE" /auto /hide

autoinstall/easymnemo

@@ -16,7 +16,7 @@ AUTOINSTALL_SETUP="${WH_TMP_DIR}/Easymnemo/EasyMnemo.msi"
 
 prepair_wine
 if try_download "https://s.siteapi.org/c6e311629e736a8.ru/docs/j3pdl4vxv5wkg0sg0ksks40k8ss0sc" "${AUTOINSTALL_EXE}" ; then
-    7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
     try_remove_file "$AUTOINSTALL_EXE"
 
     wine_run_install "${AUTOINSTALL_SETUP}" /q

autoinstall/spravki-bk

@@ -16,7 +16,7 @@ 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}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
     try_remove_file "$AUTOINSTALL_EXE"
 
     wine_run_install "${AUTOINSTALL_SETUP}" /q

autoinstall/t-flex-cad-edu17

@@ -12,65 +12,6 @@ export PROG_ICON="tflexcad"
 export INSTALL_DLL="corefonts d3dcompiler_47 dotnet48 vcrun2019 ucrtbase2019 msxml6 fontsmooth=rgb baekmuk droid eufonts ipamona liberation lucida opensymbol sourcehansans tahoma takao uff unifont vlgothic wenquanyi wenquanyizenhei"
 
 prepair_wine
-if [[ "$BASE_PFX" == "none" ]] \
-|| ! systemctl list-units --type service --state running | grep aksusbd \
-|| ! systemctl list-units --type service --state running | grep hasplmd
-then
-    # Компоненты поддержки T-FLEX PLM 17 (Linux)
-    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"
-        "$WINELOADER" regedit "${AUTOINSTALL_EXE_LIN1}"
-    fi
-
-    if [[ "$BASE_PFX" == "none" ]] ; then
-        # Компоненты поддержки T-FLEX PLM 17 (Windows)
-        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"
-
-            7z x -y "${AUTOINSTALL_EXE_WIN1}" -o"${AUTOINSTALL_EXE_WIN_MSY}"
-            try_remove_file "$AUTOINSTALL_EXE_WIN1"
-
-            wine_run_install "${AUTOINSTALL_EXE_WIN_MSY}/AceRedist.msi" /q
-            wine_run_install "${AUTOINSTALL_EXE_WIN2}" /q
-        fi
-        rm -fR "$DRIVE_C/Program Files/Common Files/System"
-        rm -fR "$DRIVE_C/Program Files (x86)/Common Files/System"
-        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 "${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 \
-    && systemctl list-units --type service --state running | grep hasplmd
-    then
-        print_info "Службы aksusbd и hasplmd уже запущены. Пропускаем..."
-    else
-        echo "#!/usr/bin/env bash
-        cd \"${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/HASP_Linux/aksusbd/\"
-        bash ./dinst
-        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 "${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/"
-fi
 
 # Программа T-FLEX CAD Учебная Версия
 export AUTOINSTALL_ZIP="${WH_TMP_DIR}/TFCAD_ST_17x64_PACK.zip"
@@ -80,7 +21,7 @@ export AUTOINSTALL_COMPONENTS="${WH_TMP_DIR}/Компоненты поддерж
 export AUTOINSTALL_ELEMENTS="${WH_TMP_DIR}/Стандартные элементы 17/Стандартные элементы 17.msi"
 
 if try_download "https://www.tflexcad.ru/download/t-flex-cad-free/files/TFCAD_ST_17x64_PACK.zip" "${AUTOINSTALL_ZIP}" ; then
-    7z x -y "${AUTOINSTALL_ZIP}" -o"${AUTOINSTALL_DIR}"
+    unpack "${AUTOINSTALL_ZIP}" "${AUTOINSTALL_DIR}"
     try_remove_file "${AUTOINSTALL_ZIP}"
 
     wine_run_install "${AUTOINSTALL_EDUCATION}" /q

autoinstall/t-flex-cad17

@@ -12,65 +12,6 @@ export PROG_ICON="tflexcad"
 export INSTALL_DLL="corefonts d3dcompiler_47 dotnet48 vcrun2019 ucrtbase2019 msxml6 fontsmooth=rgb baekmuk droid eufonts ipamona liberation lucida opensymbol sourcehansans tahoma takao uff unifont vlgothic wenquanyi wenquanyizenhei"
 
 prepair_wine
-if [[ "$BASE_PFX" == "none" ]] \
-|| ! systemctl list-units --type service --state running | grep aksusbd \
-|| ! systemctl list-units --type service --state running | grep hasplmd
-then
-    # Компоненты поддержки T-FLEX PLM 17 (Linux)
-    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"
-        "$WINELOADER" regedit "${AUTOINSTALL_EXE_LIN1}"
-    fi
-
-    if [[ "$BASE_PFX" == "none" ]] ; then
-        # Компоненты поддержки T-FLEX PLM 17 (Windows)
-        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"
-
-            7z x -y "${AUTOINSTALL_EXE_WIN1}" -o"${AUTOINSTALL_EXE_WIN_MSY}"
-            try_remove_file "$AUTOINSTALL_EXE_WIN1"
-
-            wine_run_install "${AUTOINSTALL_EXE_WIN_MSY}/AceRedist.msi" /q
-            wine_run_install "${AUTOINSTALL_EXE_WIN2}" /q
-        fi
-        rm -fR "$DRIVE_C/Program Files/Common Files/System"
-        rm -fR "$DRIVE_C/Program Files (x86)/Common Files/System"
-        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 "${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 \
-    && systemctl list-units --type service --state running | grep hasplmd
-    then
-        print_info "Службы aksusbd и hasplmd уже запущены. Пропускаем..."
-    else
-        echo "#!/usr/bin/env bash
-        cd \"${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/HASP_Linux/aksusbd/\"
-        bash ./dinst
-        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 "${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/"
-fi
 
 # Программа T-FLEX CAD
 export AUTOINSTALL_ZIP="${WH_TMP_DIR}/T-FLEX CAD 17.zip"
@@ -78,7 +19,7 @@ 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}"
+    unpack "${AUTOINSTALL_ZIP}" "${AUTOINSTALL_DIR}"
     try_remove_file "${AUTOINSTALL_ZIP}"
 
     wine_run_install "${AUTOINSTALL_EXE}" /q

autoinstall/t-flex-cad17-applications

@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+# info_ru: Приложения для T-FLEX CAD 17 (T-FLEX Анализ 17, T-FLEX Динамика 17, T-FLEX Зубчатые передачи 17, T-FLEX ЧПУ 17, T-FLEX Раскрой 17, T-FLEX Электротехника 17, T-FLEX VR 17, T-FLEX Печатные платы 17)
+########################################################################
+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"
+
+BASE_URL="https://www.tflex.ru/downloads"
+FILES=(
+    "T-FLEX Analysis 17.zip"
+    "T-FLEX Dynamics 17.zip"
+    "T-FLEX Gears 17.zip"
+    "T-FLEX CAM 17.zip"
+    "T-FLEX Nesting 17.zip"
+    "T-FLEX Electrical 17.zip"
+    "T-FLEX VR 17.zip"
+    "T-FLEX Circuits 17.zip"
+)
+UNPACK_APP="${WH_TMP_DIR}/unpack_applications"
+
+prepair_wine
+
+# Скачивание всех файлов
+for file_name in "${FILES[@]}" ; do
+    local output="${WH_TMP_DIR}/${file_name// /_}"
+
+    print_info "Скачивание $file_name..."
+    if try_download "$BASE_URL/$file_name" "$output" ; then
+        unpack "$output" "${UNPACK_APP}"
+    fi
+    try_remove_file "$output"
+done
+
+# Установка .msi файлов
+for msi_file in "${UNPACK_APP}"/*/*.msi ; do
+    if [[ -f "$msi_file" ]] ; then
+        print_info "Установка $msi_file ..."
+        wine_run_install "$msi_file" /q
+    else
+        fatal "Нет .msi файлов для установки в ${UNPACK_APP}/*."
+    fi
+done
+
+try_remove_dir "${UNPACK_APP}"

autoinstall/t-flex-cad17-prepair

@@ -0,0 +1,73 @@
+#!/usr/bin/env bash
+# info_ru: Компоненты поддержки T-FLEX 17
+########################################################################
+export PROG_NAME="T-FLEX CAD 17"
+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"
+export PROG_VERSION=""
+export PROG_ICON="tflexcad"
+export INSTALL_DLL="corefonts d3dcompiler_47 dotnet48 vcrun2019 ucrtbase2019 msxml6 fontsmooth=rgb baekmuk droid eufonts ipamona liberation lucida opensymbol sourcehansans tahoma takao uff unifont vlgothic wenquanyi wenquanyizenhei"
+
+prepair_wine
+if [[ "$BASE_PFX" == "none" ]] \
+|| ! systemctl list-units --type service --state running | grep aksusbd \
+|| ! systemctl list-units --type service --state running | grep hasplmd
+then
+    # Компоненты поддержки T-FLEX PLM 17 (Linux)
+    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
+        unpack "${AUTOINSTALL_ZIP_LIN}" "${AUTOINSTALL_DIR_LIN}"
+        try_remove_file "$AUTOINSTALL_ZIP_LIN"
+        "$WINELOADER" regedit "${AUTOINSTALL_EXE_LIN1}"
+    fi
+
+    if [[ "$BASE_PFX" == "none" ]] ; then
+        # Компоненты поддержки T-FLEX PLM 17 (Windows)
+        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
+            unpack "${AUTOINSTALL_ZIP_WIN}" "${AUTOINSTALL_DIRWIN}"
+            try_remove_file "$AUTOINSTALL_ZIP_WIN"
+
+            unpack "${AUTOINSTALL_EXE_WIN1}" "${AUTOINSTALL_EXE_WIN_MSY}"
+            try_remove_file "$AUTOINSTALL_EXE_WIN1"
+
+            wine_run_install "${AUTOINSTALL_EXE_WIN_MSY}/AceRedist.msi" /q
+            wine_run_install "${AUTOINSTALL_EXE_WIN2}" /q
+        fi
+        rm -fR "$DRIVE_C/Program Files/Common Files/System"
+        rm -fR "$DRIVE_C/Program Files (x86)/Common Files/System"
+        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 "${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 \
+    && systemctl list-units --type service --state running | grep hasplmd
+    then
+        print_info "Службы aksusbd и hasplmd уже запущены. Пропускаем..."
+    else
+        echo "#!/usr/bin/env bash
+        cd \"${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/HASP_Linux/aksusbd/\"
+        bash ./dinst
+        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 "${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/"
+fi

autoinstall/t-flex-cad17-resources

@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+# info_ru: Обучающие материалы, примеры, бесплатные библиотеки для T-FLEX CAD 17 (Учебное пособие 17, Стандартные элементы 17, Элементы уплотнительной техники 17, Станочные приспособления 17, Детали штампов листовой штамповки 17, Детали пресс-форм 17, Примеры 17)
+########################################################################
+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"
+
+BASE_URL="https://www.tflex.ru/downloads"
+FILES=(
+    "T-FLEX Tutorial 17.zip"
+    "Standard parts 17.zip"
+    "Elements of sealing technology 17.zip"
+    "Machine tools 17.zip"
+    "Standard parts for sheet metal dies 17.zip"
+    "Standard Mold Parts 17.zip"
+    "Examples 17.zip"
+)
+UNPACK_RESOURCES="${WH_TMP_DIR}/unpack_resources"
+
+prepair_wine
+
+# Скачивание всех файлов
+for file_name in "${FILES[@]}" ; do
+    local output="${WH_TMP_DIR}/${file_name// /_}"
+
+    if try_download "$BASE_URL/$file_name" "$output" ; then
+        unpack "$output" "$UNPACK_RESOURCES"
+    fi
+    try_remove_file "$output"
+done
+
+# Установка .msi файлов
+for msi_file in "${UNPACK_RESOURCES}"/*/*.msi ; do
+    if [[ -f "$msi_file" ]] ; then
+        wine_run_install "$msi_file" /q
+    else
+        fatal "Нет .msi файлов для установки в ${UNPACK_RESOURCES}/unpack_dop/*."
+    fi
+done
+
+try_remove_dir "${UNPACK_RESOURCES}"

autoinstall/t-flex-cad2d+17

@@ -12,65 +12,6 @@ export PROG_ICON="tflexcad"
 export INSTALL_DLL="corefonts d3dcompiler_47 dotnet48 vcrun2019 ucrtbase2019 msxml6 fontsmooth=rgb baekmuk droid eufonts ipamona liberation lucida opensymbol sourcehansans tahoma takao uff unifont vlgothic wenquanyi wenquanyizenhei"
 
 prepair_wine
-if [[ "$BASE_PFX" == "none" ]] \
-|| ! systemctl list-units --type service --state running | grep aksusbd \
-|| ! systemctl list-units --type service --state running | grep hasplmd
-then
-    # Компоненты поддержки T-FLEX PLM 17 (Linux)
-    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"
-        "$WINELOADER" regedit "${AUTOINSTALL_EXE_LIN1}"
-    fi
-
-    if [[ "$BASE_PFX" == "none" ]] ; then
-        # Компоненты поддержки T-FLEX PLM 17 (Windows)
-        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"
-
-            7z x -y "${AUTOINSTALL_EXE_WIN1}" -o"${AUTOINSTALL_EXE_WIN_MSY}"
-            try_remove_file "$AUTOINSTALL_EXE_WIN1"
-
-            wine_run_install "${AUTOINSTALL_EXE_WIN_MSY}/AceRedist.msi" /q
-            wine_run_install "${AUTOINSTALL_EXE_WIN2}" /q
-        fi
-        rm -fR "$DRIVE_C/Program Files/Common Files/System"
-        rm -fR "$DRIVE_C/Program Files (x86)/Common Files/System"
-        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 "${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 \
-    && systemctl list-units --type service --state running | grep hasplmd
-    then
-        print_info "Службы aksusbd и hasplmd уже запущены. Пропускаем..."
-    else
-        echo "#!/usr/bin/env bash
-        cd \"${WH_TMP_DIR}/Prerequisites_T-FLEX_17_Linux/HASP_Linux/aksusbd/\"
-        bash ./dinst
-        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 "${WH_TMP_DIR}/Компоненты поддержки T-FLEX 17/"
-fi
 
 # Программа T-FLEX CAD 2D+ 17
 export AUTOINSTALL_ZIP="${WH_TMP_DIR}/T-FLEX CAD 2D+ 17.zip"
@@ -78,7 +19,7 @@ export AUTOINSTALL_DIR="${WH_TMP_DIR}"
 export AUTOINSTALL_EXE="${WH_TMP_DIR}/T-FLEX CAD 2D+ 17/T-FLEX CAD 2D+ 17.msi"
 
 if try_download "https://www.tflex.ru/downloads/T-FLEX%20CAD%202D+%2017.zip" "${AUTOINSTALL_ZIP}" ; then
-    7z x -y "${AUTOINSTALL_ZIP}" -o"${AUTOINSTALL_DIR}"
+    unpack "${AUTOINSTALL_ZIP}" "${AUTOINSTALL_DIR}"
     try_remove_file "${AUTOINSTALL_ZIP}"
 
     wine_run_install "${AUTOINSTALL_EXE}" /q

autoinstall/t-flex-doc17

@@ -23,7 +23,7 @@ then
     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}"
+        unpack "${AUTOINSTALL_ZIP_LIN}" "${AUTOINSTALL_DIR_LIN}"
         try_remove_file "$AUTOINSTALL_ZIP_LIN"
         "$WINELOADER" regedit "${AUTOINSTALL_EXE_LIN1}"
     fi
@@ -36,10 +36,10 @@ then
         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}"
+            unpack "${AUTOINSTALL_ZIP_WIN}" "${AUTOINSTALL_DIRWIN}"
             try_remove_file "$AUTOINSTALL_ZIP_WIN"
 
-            7z x -y "${AUTOINSTALL_EXE_WIN1}" -o"${AUTOINSTALL_EXE_WIN_MSY}"
+            unpack "${AUTOINSTALL_EXE_WIN1}" "${AUTOINSTALL_EXE_WIN_MSY}"
             try_remove_file "$AUTOINSTALL_EXE_WIN1"
 
             wine_run_install "${AUTOINSTALL_EXE_WIN_MSY}/AceRedist.msi" /q
@@ -80,7 +80,7 @@ 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}"
+    unpack "${AUTOINSTALL_ZIP}" "${AUTOINSTALL_DIR}"
     try_remove_file "${AUTOINSTALL_ZIP}"
 
     wine_run_install "${AUTOINSTALL_EXE}" /q

autoinstall/t-flex-viewer17

@@ -21,7 +21,7 @@ then
     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}"
+        unpack "${AUTOINSTALL_ZIP_LIN}" "${AUTOINSTALL_DIR_LIN}"
         try_remove_file "$AUTOINSTALL_ZIP_LIN"
         "$WINELOADER" regedit "${AUTOINSTALL_EXE_LIN1}"
     fi
@@ -34,10 +34,10 @@ then
         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}"
+            unpack "${AUTOINSTALL_ZIP_WIN}" "${AUTOINSTALL_DIRWIN}"
             try_remove_file "$AUTOINSTALL_ZIP_WIN"
 
-            7z x -y "${AUTOINSTALL_EXE_WIN1}" -o"${AUTOINSTALL_EXE_WIN_MSY}"
+            unpack "${AUTOINSTALL_EXE_WIN1}" "${AUTOINSTALL_EXE_WIN_MSY}"
             try_remove_file "$AUTOINSTALL_EXE_WIN1"
 
             wine_run_install "${AUTOINSTALL_EXE_WIN_MSY}/AceRedist.msi" /q
@@ -78,7 +78,7 @@ export AUTOINSTALL_DIR="${WH_TMP_DIR}"
 export AUTOINSTALL_EXE="${WH_TMP_DIR}/T-FLEX Viewer 17/T-FLEX Viewer 17.msi"
 
 if try_download "https://www.tflex.ru/downloads/T-FLEX%20Viewer%2017.zip" "${AUTOINSTALL_ZIP}" ; then
-    7z x -y "${AUTOINSTALL_ZIP}" -o"${AUTOINSTALL_DIR}"
+    unpack "${AUTOINSTALL_ZIP}" "${AUTOINSTALL_DIR}"
     try_remove_file "${AUTOINSTALL_ZIP}"
 
     wine_run_install "${AUTOINSTALL_EXE}" /q

autoinstall/ved-alf

@@ -18,7 +18,7 @@ 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}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
     try_remove_file "$AUTOINSTALL_EXE"
 
     wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\CTM\\\\ALPHABET" /auto /hide

autoinstall/ved-control

@@ -18,7 +18,7 @@ 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}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
     try_remove_file "$AUTOINSTALL_EXE"
 
     wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\CTM\\\\CONTROL" /auto /hide

autoinstall/ved-dcl

@@ -18,7 +18,7 @@ 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}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
     try_remove_file "$AUTOINSTALL_EXE"
 
     wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\CTM\\\\DCL" /auto /hide

autoinstall/ved-info

@@ -18,7 +18,7 @@ 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}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
     try_remove_file "$AUTOINSTALL_EXE"
 
     wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\CTM\\\\VED_INFO" /auto /hide

autoinstall/ved-payments

@@ -18,7 +18,7 @@ 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}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
     try_remove_file "$AUTOINSTALL_EXE"
 
     wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\CTM\\\\PAYMENT" /auto /hide

autoinstall/ved-sts

@@ -18,7 +18,7 @@ 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}"
+    unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
     try_remove_file "$AUTOINSTALL_EXE"
 
     wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\CTM\\\\STS" /auto /hide

manualinstall/daobit-cservice

@@ -16,7 +16,7 @@ EXE_SETUP_NAME="setup_cs.exe"
 if [[ -f "$2" ]] && [[ $2 =~ $EXE_SETUP_NAME$ ]] ; then
     prepair_wine
 
-    7z x -y "$2" -o"${AUTOINSTALL_UNPACK}"
+    unpack "$2" "${AUTOINSTALL_UNPACK}"
     wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\DAO\\\\CSERVICE" /auto /hide
 
     WIN_FILE_EXEC="$DRIVE_C/Program Files/DAO/CSERVICE/CService32.exe"

manualinstall/daobit-ratlas

@@ -16,7 +16,7 @@ EXE_SETUP_NAME="setup_rk.exe"
 if [[ -f "$2" ]] && [[ $2 =~ $EXE_SETUP_NAME$ ]] ; then
     prepair_wine
 
-    7z x -y "$2" -o"${AUTOINSTALL_UNPACK}"
+    unpack "$2" "${AUTOINSTALL_UNPACK}"
     wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\DAO\\\\RAtlas" /auto /hide
 
     WIN_FILE_EXEC="$DRIVE_C/Program Files/DAO/RAtlas/ratlas.exe"

manualinstall/daobit-rinfo

@@ -16,7 +16,7 @@ EXE_SETUP_NAME="setup_ri.exe"
 if [[ -f "$2" ]] && [[ $2 =~ $EXE_SETUP_NAME$ ]] ; then
     prepair_wine
 
-    7z x -y "$2" -o"${AUTOINSTALL_UNPACK}"
+    unpack "$2" "${AUTOINSTALL_UNPACK}"
     wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\DAO\\\\RInfo" /auto /hide
 
     WIN_FILE_EXEC="$DRIVE_C/Program Files/DAO/RInfo/rinfo.exe"

manualinstall/daobit-rtariff

@@ -16,7 +16,7 @@ EXE_SETUP_NAME="setup_rt.exe"
 if [[ -f "$2" ]] && [[ $2 =~ $EXE_SETUP_NAME$ ]] ; then
     prepair_wine
 
-    7z x -y "$2" -o"${AUTOINSTALL_UNPACK}"
+    unpack "$2" "${AUTOINSTALL_UNPACK}"
     wine_run_install "${AUTOINSTALL_SETUP}" /cd /targetdir="C:\\\\Program Files\\\\DAO\\\\RTariff" /auto /hide
 
     WIN_FILE_EXEC="$DRIVE_C/Program Files/DAO/RTariff/Tariff.exe"

winehelper

@@ -6,6 +6,27 @@ if [[ $(id -u) -eq 0 ]] ; then
     exit 1
 fi
 
+##### DEFAULT PATH #####
+SCRIPT_NAME="$(basename "$0")"
+if [[ "$(realpath "$0")" == "/usr/bin/$SCRIPT_NAME" ]] ; then
+    # переменные для установленного WineHelper в систему
+    USER_WORK_PATH="$HOME/.local/share/$SCRIPT_NAME"
+    RUN_SCRIPT="/usr/bin/$SCRIPT_NAME"
+    DATA_PATH="/usr/share/$SCRIPT_NAME"
+else
+    # переменные для тестового запуска WineHelper из репозитория
+    USER_WORK_PATH="$HOME/test-$SCRIPT_NAME"
+    RUN_SCRIPT="$(realpath "$0")"
+    DATA_PATH="$(dirname "$RUN_SCRIPT")"
+
+    # минимальная проверка синтаксиса скриптов
+    for self_check_script in "$RUN_SCRIPT" \
+    "$DATA_PATH/dependencies.sh" "$DATA_PATH/autoinstall"/* \
+    "$DATA_PATH/manualinstall"/* "$DATA_PATH/database"/*
+    do /usr/bin/bash -n "$self_check_script" || exit 1
+    done
+fi
+
 ##### MESSAGES FUNCTIONS #####
 print_error () { printf "\E[31m%s Ошибка: $@ %s\e[0m\n" ;}
 print_warning () { printf "\E[33m%s Предупреждение: $@ %s\e[0m\n" ;}
@@ -53,17 +74,6 @@ fi
 WINETRICKS_VERSION="20250102"
 
 ##### DEFAULT VARIABLES #####
-SCRIPT_NAME="$(basename "$0")"
-if [[ "$(realpath "$0")" == "/usr/bin/$SCRIPT_NAME" ]] ; then
-    USER_WORK_PATH="$HOME/.local/share/$SCRIPT_NAME"
-    RUN_SCRIPT="/usr/bin/$SCRIPT_NAME"
-    DATA_PATH="/usr/share/$SCRIPT_NAME"
-else
-    USER_WORK_PATH="$HOME/test-$SCRIPT_NAME"
-    RUN_SCRIPT="$(realpath "$0")"
-    DATA_PATH="$(dirname "$RUN_SCRIPT")"
-fi
-
 WH_VULKAN_LIBDIR="$USER_WORK_PATH/vulkan"
 WH_PREFIXES_DIR="$USER_WORK_PATH/prefixes"
 WH_DIST_DIR="$USER_WORK_PATH/dist"
@@ -228,24 +238,26 @@ create_new_dir () {
 
 unpack () {
     print_info "Запуск распаковки архива $1"
+    local command outarg
     case $1 in
-         *.tar.xz) local command="tar -Jxhf";;
+         *.tar.xz) command="tar -Jxhf" ; outarg="-C " ;;
-         *.tar.gz) local command="tar -xhzf" ;;
+         *.tar.gz) command="tar -xhzf" ; outarg="-C " ;;
-        *.tar.zst) local command="tar -I zstd -xhf" ;;
+        *.tar.zst) command="tar -I zstd -xhf" ; outarg="-C " ;;
-            *.tar) local command="tar -xhf" ;;
+            *.tar) command="tar -xhf" ; outarg="-C " ;;
+      *.zip|*.exe) command="7z x -y" ; outarg="-o" ;;
     esac
     create_new_dir "$2"
-    if $command "$1" -C "$2" ; then
+    if $command "$1" ${outarg}"$2" ; then
-        print_ok "Архив $1 распакован."
+        print_ok "Файл $1 распакован."
         return 0
     else
-        print_error "Распаковать архив $1 не удалось!"
+        print_error "Распаковать файл $1 не удалось!"
         return 1
     fi
 }
 
 try_download () {
-    local DOWNLOAD_FILE_URL="$1"
+    local DOWNLOAD_FILE_URL="${1// /%20}"
     local OUTPUT_FILE="$2"
     local OUTPUT_FILE_NAME="$(basename "$OUTPUT_FILE")"
 
@@ -923,6 +935,12 @@ init_wineprefix () {
     then try_force_link_dir "$DRIVE_C/users/$USER" "$DRIVE_C/users/xuser"
     fi
 
+    if [[ ! -f "$WINEPREFIX/.update-timestamp" ]] ; then
+        print_info "Обновление префикса $WINEPREFIX."
+        "$WINELOADER" wineboot -u
+        wait_wineserver
+    fi
+
     if [[ ! -L "$WINEPREFIX/dosdevices/h:" ]]
     then try_force_link_dir "$HOME" "$WINEPREFIX/dosdevices/h:"
     fi
@@ -1158,7 +1176,7 @@ wine_run () {
 }
 
 wine_run_install () {
-    print_info "Запускаем установку приложения $PROG_NAME."
+    print_info "Запускаем установку: $1."
     if [[ "$INSTALL_MODE" == "manual" ]]
     then print_warning "Рекомендуется не менять пути для установки приложения!"
     fi
@@ -1324,6 +1342,8 @@ backup_prefix() {
     local backup_archive_name="backup_${PREFIX_NAME}_$(date +%Y.%m.%d).whpack"
     local backup_dest_path="$backup_base_dir/$backup_archive_name"
     local temp_backup_dir="$WH_TMP_DIR/backup_${PREFIX_NAME}_$(date +%Y.%m.%d)"
+    local temp_prefix_dir="$temp_backup_dir/prefixes/$PREFIX_NAME"
+    local temp_users_dir="$temp_prefix_dir/drive_c/users"
 
     print_info "Начало резервного копирования префикса: $PREFIX_NAME"
     create_new_dir "$temp_backup_dir"
@@ -1331,7 +1351,19 @@ backup_prefix() {
     create_new_dir "$temp_backup_dir/dist/"
 
     print_info "Подготовка префикса к упаковке..."
-    if cp -a "$WINEPREFIX" "$temp_backup_dir/prefixes/$PREFIX_NAME" ; then
+    if cp -a "$WINEPREFIX" "$temp_prefix_dir" ; then
+        try_remove_dir "$temp_prefix_dir/dosdevices"
+        try_remove_file "$temp_prefix_dir/.update-timestamp"
+        if [[ -d "$temp_users_dir/$USER" ]] \
+        && [[ ! -L "$temp_users_dir/$USER" ]]
+        then
+            if [[ -L "$temp_users_dir/xuser" ]]
+            then try_remove_dir "$temp_users_dir/xuser"
+            fi
+            create_new_dir "$temp_users_dir/xuser"
+            cp -fr "$temp_users_dir/$USER"/* "$temp_users_dir/xuser/"
+        fi
+        try_remove_dir "$temp_users_dir/$USER"
         print_ok "Директория префикса подготовлена."
     else
         print_error "Не удалось подготовить директорию префикса."