added installed and run commands

autoinstall/ctm-finance

@@ -5,8 +5,8 @@ export PROG_NAME="СТМ-Финансы"
 export PROG_ICON="ctmfinance"
 
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
-export WINEPREFIX="wed"
-export BASE_PFX="wed_pfx_x86_v02"
+export WINEPREFIX="ved_ctm"
+export BASE_PFX="ved_ctm_pfx_x86_v03"
 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"

autoinstall/ctm-journals

@@ -5,8 +5,8 @@ export PROG_NAME="СТМ-Журналы"
 export PROG_ICON="ctmjournals"
 
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
-export WINEPREFIX="wed"
-export BASE_PFX="wed_pfx_x86_v02"
+export WINEPREFIX="ved_ctm"
+export BASE_PFX="ved_ctm_pfx_x86_v03"
 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"

autoinstall/ctm-monitor

@@ -5,8 +5,8 @@ export PROG_NAME="Монитор ЭД"
 export PROG_ICON="ctmmonitor"
 
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
-export WINEPREFIX="wed"
-export BASE_PFX="wed_pfx_x86_v02"
+export WINEPREFIX="ved_ctm"
+export BASE_PFX="ved_ctm_pfx_x86_v03"
 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"

autoinstall/ctm-report

@@ -5,8 +5,8 @@ export PROG_NAME="СТМ-Отчет"
 export PROG_ICON="ctmreport"
 
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
-export WINEPREFIX="wed"
-export BASE_PFX="wed_pfx_x86_v02"
+export WINEPREFIX="ved_ctm"
+export BASE_PFX="ved_ctm_pfx_x86_v03"
 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"

autoinstall/ctm-service

@@ -5,8 +5,8 @@ export PROG_NAME="СТМ-Сервис"
 export PROG_ICON="ctmservice"
 
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
-export WINEPREFIX="wed"
-export BASE_PFX="wed_pfx_x86_v02"
+export WINEPREFIX="ved_ctm"
+export BASE_PFX="ved_ctm_pfx_x86_v03"
 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"

autoinstall/ved-alf

@@ -2,11 +2,11 @@
 # info_ru: Электронный алфавитно-предметный указатель, предназначенный для быстрого и простого подбора для товара кода ТН ВЭД ЕАЭС.
 ########################################################################
 export PROG_NAME="ВЭД-Алфавит"
-export PROG_ICON="wedalf"
+export PROG_ICON="vedalf"
 
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
-export WINEPREFIX="wed"
-export BASE_PFX="wed_pfx_x86_v02"
+export WINEPREFIX="ved_ctm"
+export BASE_PFX="ved_ctm_pfx_x86_v03"
 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"
@@ -34,6 +34,6 @@ if try_download "https://ftp.ctm.ru/ALPHABET/SFX/setup_al.exe" "${AUTOINSTALL_EX
         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"
+        create_desktop "CTM-Офис" "$WIN_FILE_EXEC1" "vedctmbar"
     fi
 fi

autoinstall/ved-control

@@ -2,11 +2,11 @@
 # info_ru: Программа для проверки ДТ и ДТС до представления их в таможенные органы и для внесения изменений в электронный вид документов.
 ########################################################################
 export PROG_NAME="ВЭД-Контроль"
-export PROG_ICON="wedcontrol"
+export PROG_ICON="vedcontrol"
 
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
-export WINEPREFIX="wed"
-export BASE_PFX="wed_pfx_x86_v02"
+export WINEPREFIX="ved_ctm"
+export BASE_PFX="ved_ctm_pfx_x86_v03"
 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"
@@ -34,6 +34,6 @@ if try_download "https://ftp.ctm.ru/CONTROL/SFX/setup_cl.exe" "${AUTOINSTALL_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"
+        create_desktop "CTM-Офис" "$WIN_FILE_EXEC1" "vedctmbar"
     fi
 fi

autoinstall/ved-dcl

@@ -2,11 +2,11 @@
 # info_ru: Программа для формирования полного комплекта документов для таможенного оформления.
 ########################################################################
 export PROG_NAME="ВЭД-Декларант"
-export PROG_ICON="weddcl"
+export PROG_ICON="veddcl"
 
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
-export WINEPREFIX="wed"
-export BASE_PFX="wed_pfx_x86_v02"
+export WINEPREFIX="ved_ctm"
+export BASE_PFX="ved_ctm_pfx_x86_v03"
 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"
@@ -25,7 +25,7 @@ if try_download "https://ftp.ctm.ru/DCL/SFX/setup_dl.exe" "${AUTOINSTALL_EXE}" ;
     try_remove_dir "$AUTOINSTALL_UNPACK"
 
     WIN_FILE_EXEC="$DRIVE_C/Program Files/CTM/DCL/DCL.EXE"
-    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "weddcl"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "veddcl"
 
     if [[ "$USE_CTMBAR" == "1" ]] ; then
         if [[ -f "$DRIVE_C/Program Files/CTM/COMMON/CTMBAR.EXE" ]]
@@ -34,6 +34,6 @@ if try_download "https://ftp.ctm.ru/DCL/SFX/setup_dl.exe" "${AUTOINSTALL_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"
+        create_desktop "CTM-Офис" "$WIN_FILE_EXEC1" "vedctmbar"
     fi
 fi

autoinstall/ved-info

@@ -2,11 +2,11 @@
 # info_ru: Уникальный электронный справочник по таможенному законодательству государств-членов Евразийского экономического союза, содержащий актуальную нормативно-правовую базу в сфере регулирования внешнеэкономической деятельности.
 ########################################################################
 export PROG_NAME="ВЭД-Инфо"
-export PROG_ICON="wedinfo"
+export PROG_ICON="vedinfo"
 
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
-export WINEPREFIX="wed"
-export BASE_PFX="wed_pfx_x86_v02"
+export WINEPREFIX="ved_ctm"
+export BASE_PFX="ved_ctm_pfx_x86_v03"
 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"
@@ -34,6 +34,6 @@ if try_download "https://ftp.ctm.ru/VEDINFO/SFX/setup_vi.exe" "${AUTOINSTALL_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"
+        create_desktop "CTM-Офис" "$WIN_FILE_EXEC1" "vedctmbar"
     fi
 fi

autoinstall/ved-payments

@@ -2,11 +2,11 @@
 # info_ru: Программа для расчета таможенных платежей и стоимости товаров после «таможенной очистки»
 ########################################################################
 export PROG_NAME="ВЭД-Платежи"
-export PROG_ICON="wedpayments"
+export PROG_ICON="vedpayments"
 
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
-export WINEPREFIX="wed"
-export BASE_PFX="wed_pfx_x86_v02"
+export WINEPREFIX="ved_ctm"
+export BASE_PFX="ved_ctm_pfx_x86_v03"
 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"
@@ -34,6 +34,6 @@ if try_download "https://ftp.ctm.ru/PAYMENT/SFX/setup_pa.exe" "${AUTOINSTALL_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"
+        create_desktop "CTM-Офис" "$WIN_FILE_EXEC1" "vedctmbar"
     fi
 fi

autoinstall/ved-sts

@@ -2,11 +2,11 @@
 # info_ru: Программа для формирования полного комплекта документов для таможенного оформления.
 ########################################################################
 export PROG_NAME="ВЭД-Склад"
-export PROG_ICON="wedsts"
+export PROG_ICON="vedsts"
 
 export WH_WINE_USE="wine_x_tkg_10-0_amd64"
-export WINEPREFIX="wed"
-export BASE_PFX="wed_pfx_x86_v02"
+export WINEPREFIX="ved_ctm"
+export BASE_PFX="ved_ctm_pfx_x86_v03"
 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"
@@ -25,10 +25,10 @@ if try_download "https://ftp.ctm.ru/STS/SFX/setup_st.exe" "${AUTOINSTALL_EXE}" ;
     try_remove_dir "$AUTOINSTALL_UNPACK"
 
     WIN_FILE_EXEC="$DRIVE_C/Program Files/CTM/STS/sts.exe"
-    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "wedsts"
+    create_desktop "$PROG_NAME" "$WIN_FILE_EXEC" "vedsts"
 
     WIN_FILE_EXEC2="$DRIVE_C/Program Files/CTM/STS/stshost.exe"
-    create_desktop "ВЭД-Склад (хост-Д)" "$WIN_FILE_EXEC2" "wedstshost"
+    create_desktop "ВЭД-Склад (хост-Д)" "$WIN_FILE_EXEC2" "vedstshost"
 
     if [[ "$USE_CTMBAR" == "1" ]] ; then
         if [[ -f "$DRIVE_C/Program Files/CTM/COMMON/CTMBAR.EXE" ]]
@@ -37,6 +37,6 @@ if try_download "https://ftp.ctm.ru/STS/SFX/setup_st.exe" "${AUTOINSTALL_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"
+        create_desktop "CTM-Офис" "$WIN_FILE_EXEC1" "vedctmbar"
     fi
 fi

sha256sum.list

@@ -24,7 +24,7 @@ f4cb2f380ad8887f334c6eb3c272b343ae8de327764945266e9e74f8acbac69f  tflex17_pfx_x6
 # create with wine_x_tkg_10-0_amd64 (universal user: xuser)
 # winetricks isolate_home msxml6 ipamona opensymbol wenquanyi ucrtbase2019 uff unifont droid wenquanyizenhei remove_mono internal dotnet40 dotnet48 dotnet20sp2 eufonts takao d3dcompiler_47 fontsmooth=rgb vcrun2022 vlgothic andale arial comicsans courier georgia impact times trebuchet verdana webdings corefonts liberation sourcehansans baekmuk tahoma lucida
 
-7edbd69b40b8ca3fb3594933c6cd37030180c494c08fd13cbd1a5b46565d65e6  wed_pfx_x86_v02.tar.xz
+7edbd69b40b8ca3fb3594933c6cd37030180c494c08fd13cbd1a5b46565d65e6  ved_ctm_pfx_x86_v03.tar.xz
 # create with wine_x_tkg_10-0_amd64 (universal user: xuser)
 # winetricks isolate_home msxml6 mdac27 wsh57 jet40 vb6run mdac28 vcrun2022 msxml3 arial dotnet40 dotnet48 art2k7min vcrun6 andale comicsans courier georgia impact times trebuchet verdana webdings corefonts msls31 ie8
 

winehelper

@@ -219,6 +219,7 @@ create_new_dir () {
 }
 
 unpack () {
+    print_info "Запуск распаковки архива $1"
     case $1 in
          *.tar.xz) local command="tar -Jxhf";;
          *.tar.gz) local command="tar -xhzf" ;;
@@ -350,6 +351,7 @@ var_ld_library_path_update () {
     return 0
 }
 
+##### CREATE DESKTOP FILE #####
 create_desktop () {
     local name_desktop="$1"
     local exe_file="$2"
@@ -381,13 +383,56 @@ create_desktop () {
     if [[ "$USE_AI_SCRIPTS" == "1" ]] \
     && [[ -f "$exe_file" ]]
     then
-        grep -e "#!" -e "export" -e "var_" "$WH_AUTOINSTALL_DIR/$AI_SCRIPT" \
+        {
+            echo '#!/usr/bin/env bash'
+            echo "# cmd_name: $AI_SCRIPT"
+        } > "$exe_file".whdb
+        grep -e "info_" -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
+        | awk '{$1=$1;print}' >> "$exe_file".whdb
         print_info "Создан файл настроек для $exe_file"
     fi
 }
 
+##### INSTALLED PROGRAMS #####
+check_installed_programs () {
+    for desktop_file in "$USER_WORK_PATH"/*.desktop ; do
+        if [[ ! -f "$desktop_file" ]] ; then
+            print_info "Установленные программы не найдены."
+            return 1
+        fi
+        EXE_PATH="$(grep "Exec" "$desktop_file" | awk -F'"' '{print $4}')"
+        case "$1" in
+            check_only)
+                if [[ -z $2 ]] ; then
+                    print_error "Нет аргумента для проверки файла запуска!"
+                    print_info "Список установленных программ:"
+                    check_installed_programs
+                    exit 1
+                elif [[ "$EXE_PATH" =~ ${2}$ ]] ; then
+                    export EXE_PATH
+                    return 0
+                else
+                    fatal "Не найден файл запуска для $2"
+                fi
+            ;;
+            *)
+                if [[ -f "$EXE_PATH.whdb" ]] ; then
+                    WH_INFO_RU="$(grep "info_ru:" "$EXE_PATH.whdb" | awk -F"info_ru: " '{print $2}')"
+                    printf "\E[36m%s $SCRIPT_NAME run $(basename "$EXE_PATH") - $(basename "$desktop_file") %s\e[0m\n"
+                    echo -e "$WH_INFO_RU\n"
+                fi
+            ;;
+        esac
+    done
+}
+
+run_installed_programs () {
+    if check_installed_programs check_only "$1" ; then
+        /usr/bin/env bash -c "\"$RUN_SCRIPT\" \"$EXE_PATH\"" &
+        exit 0
+    fi
+}
 
 ##### USED WINED3D LIBRARY #####
 init_opengl () {
@@ -705,24 +750,24 @@ kill_wine () {
 
 init_database () {
     if [[ -f "$WIN_FILE_EXEC" ]] ; then
-        PPDB="$(basename "$WIN_FILE_EXEC" .exe)"
-        if [[ -f "$WIN_FILE_EXEC".ppdb ]] ; then
-            PPDB_FILE="$WIN_FILE_EXEC".ppdb
+        WHDB="$(basename "$WIN_FILE_EXEC" .exe)"
+        if [[ -f "$WIN_FILE_EXEC".whdb ]] ; then
+            WHDB_FILE="$WIN_FILE_EXEC".whdb
         else
             orig_IFS="$IFS"
             IFS=$'\n'
-            WH_FIND_DB_FILE="$(grep -ilw "#$PPDB.exe" "$WH_DB_DIR"/* )"
+            WH_FIND_DB_FILE="$(grep -ilw "#$WHDB.exe" "$WH_DB_DIR"/* )"
             if [[ $(echo "$WH_FIND_DB_FILE" | wc -l) -gt 1 ]] ; then
-                print_error "Найдено более одного файла настроек: $PPDB.exe"
-                PPDB_FILE="$(echo "$WH_FIND_DB_FILE" | head -n1)"
+                print_error "Найдено более одного файла настроек: $WHDB.exe"
+                WHDB_FILE="$(echo "$WH_FIND_DB_FILE" | head -n1)"
             else
-                PPDB_FILE="$WH_FIND_DB_FILE"
+                WHDB_FILE="$WH_FIND_DB_FILE"
             fi
             IFS="$orig_IFS"
         fi
-        if [[ "$PPDB_FILE" ]] ; then
-            print_info "Используется файл настроек: $PPDB_FILE"
-            . "$PPDB_FILE"
+        if [[ "$WHDB_FILE" ]] ; then
+            print_info "Используется файл настроек: $WHDB_FILE"
+            . "$WHDB_FILE"
         else
             print_warning "Файл настроек не найден. Пропускаем."
         fi
@@ -757,11 +802,12 @@ wine_run () {
 }
 
 wine_run_install () {
+    print_info "Запускаем установку приложения $PROG_NAME."
     case "${1,,}" in
         *.exe) wine_run $WINE_WIN_START "$@" ;;
         *.msi) wine_run msiexec /i "$@" ;;
         *.bat|*.cmd) wine_run "$@" ;;
-        *) fatal "Unknown file extension." ;;
+        *) fatal "Не удалось запустить файл $1. Проверьте расширение файла." ;;
     esac
     wait_wineserver
 }
@@ -791,6 +837,8 @@ wh_info () {
 
 Команды:
     install|-i [скрипт установки]              если без аргументов, то выводит список возможных установочных скриптов
+    installed|run                              список установленных программ
+    run [программа.exe]                        запуск программы (отладка)
 
 Параметры:
     --help                                     показать эту справку и выйти
@@ -816,6 +864,8 @@ case "${1,,}" in
     winetricks) shift ; update_winetricks ; prepair_wine ; "$WINETRICKS" -q "$@" ;;
     desktop) shift ; create_desktop "$@" ; exit 0 ;;
     install|-i) shift ; run_autoinstall "$1" ;;
+    installed) shift ; check_installed_programs "$1" ;;
+    run|-r) shift ; run_installed_programs "$1" ;;
     *)
         if [[ -f "$1" ]] ; then
             WIN_FILE_EXEC="$(readlink -f "$1")"