speeding up the output of the install list

autoinstall/t-flex-cad-edu17

@@ -4,7 +4,6 @@
 export PROG_NAME="T-FLEX CAD Учебная Версия 17"
 export PROG_ICON="tflexcad"
 export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
-export BASE_PFX="tflex17_pfx_x64_v02"
 export WINEARCH="win64"
 export WH_WINDOWS_VER="10"
 export WINEPREFIX="tflex17"

autoinstall/t-flex-cad17

@@ -4,7 +4,6 @@
 export PROG_NAME="T-FLEX CAD 17"
 export PROG_ICON="tflexcad"
 export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
-export BASE_PFX="tflex17_pfx_x64_v02"
 export WINEARCH="win64"
 export WH_WINDOWS_VER="10"
 export WINEPREFIX="tflex17"

autoinstall/t-flex-cad17-applications

@@ -3,7 +3,7 @@
 ########################################################################
 export WH_WINDOWS_VER="10"
 export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
-export BASE_PFX="tflex17_pfx_x64_v02"
+export BASE_PFX="tflex17_pfx_x64_v01"
 export WINEARCH="win64"
 export WINEPREFIX="tflex17"
 export WH_XDG_OPEN="log"

autoinstall/t-flex-cad17-resources

@@ -3,7 +3,7 @@
 ########################################################################
 export WH_WINDOWS_VER="10"
 export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
-export BASE_PFX="tflex17_pfx_x64_v02"
+export BASE_PFX="tflex17_pfx_x64_v01"
 export WINEARCH="win64"
 export WINEPREFIX="tflex17"
 export WH_XDG_OPEN="log"

autoinstall/t-flex-cad2d+17

@@ -4,7 +4,6 @@
 export PROG_NAME="T-FLEX CAD 2D+ 17"
 export PROG_ICON="tflexcad"
 export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
-export BASE_PFX="tflex17_pfx_x64_v02"
 export WINEARCH="win64"
 export WH_WINDOWS_VER="10"
 export WINEPREFIX="tflex17"

autoinstall/t-flex-docs17

@@ -4,7 +4,6 @@
 export PROG_NAME="T-FLEX DOCs 17"
 export PROG_ICON="tflexdoc"
 export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
-export BASE_PFX="tflex17_pfx_x64_v02"
 export WINEARCH="win64"
 export WH_WINDOWS_VER="10"
 export WINEPREFIX="tflex17"

autoinstall/t-flex-viewer17

@@ -4,7 +4,6 @@
 export PROG_NAME="T-FLEX Viewer 17"
 export PROG_ICON="tflexcad"
 export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
-export BASE_PFX="tflex17_pfx_x64_v02"
 export WINEARCH="win64"
 export WH_WINDOWS_VER="10"
 export WINEPREFIX="tflex17"

database/t-flex-cad17.whdb

@@ -3,7 +3,7 @@
 ########################################################################
 export WH_WINDOWS_VER="10"
 export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
-export BASE_PFX="tflex17_pfx_x64_v02"
+export BASE_PFX="tflex17_pfx_x64_v01"
 export WINEARCH="win64"
 export WINEPREFIX="tflex17"
 export PROG_VERSION=""

manualinstall/t-flex-cad17-manual

@@ -4,7 +4,6 @@
 export PROG_NAME="T-FLEX CAD 17"
 export PROG_ICON="tflexcad"
 export WH_WINE_USE="wine_wh_tflex_10-9_amd64"
-export BASE_PFX="tflex17_pfx_x64_v02"
 export WINEARCH="win64"
 export WH_WINDOWS_VER="10"
 export WINEPREFIX="tflex17"

sha256sum.list

@@ -45,10 +45,6 @@ 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
 
-be09f25bb795c5f912fad2d122c68c8aed937821255f161c2d75a4773d11a044  tflex17_pfx_x64_v02.tar.xz
-# create with wine_wh_tflex_10-9_amd64
-# winetricks isolate_home msxml6 ipamona opensymbol wenquanyi ucrtbase2019 uff unifont droid wenquanyizenhei remove_mono internal dotnet40 dotnet48 dotnet20 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  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

@@ -298,7 +298,7 @@ read_page () {
         try_remove_file "$OUT_PAGE_TMP"
         unset OUT_PAGE_TMP
     else
-        echo "Используй try_get_page перед read_page"
+        echo "Исользуй try_get_page перед read_page"
     fi
 }
 
@@ -315,7 +315,7 @@ check_file_sum () {
         return 0
     else
         try_remove_file "$check_file_path"
-        fatal "Хэш-сумма файла $check_file_name не совпадает!"
+        fatal "Хэш-сумма файла $check_file_name не совподает!"
     fi
 }
 
@@ -1281,21 +1281,35 @@ run_autoinstall () {
     export INSTALL_SCRIPT INSTALL_MODE
 
     if [[ $INSTALL_SCRIPT_NAME == "list" ]] || [[ -z "$INSTALL_SCRIPT_NAME" ]] ; then
-        print_info "Список программ с возможностью автоматической установки:"
+
-        for list in $(ls "$WH_AUTOINSTALL_DIR") ; do
+        list_install_scripts() {
-            AI_INFO="$(grep "info_ru:" "$WH_AUTOINSTALL_DIR/$list" | awk -F"info_ru: " '{print $2}')"
+            local dir="$1"
-            AI_PROGNAME="$(grep "PROG_NAME=" "$WH_AUTOINSTALL_DIR/$list" | awk -F"PROG_NAME=" '{print $2}')"
+            local title="$2"
-            echo -e "\n$list - $AI_PROGNAME"
+            [[ ! -d "$dir" ]] || [[ -z "$(ls -A "$dir" 2>/dev/null)" ]] && return
-            echo "$AI_INFO"
+
-        done
+            print_info "$title"
+
+            awk '
+                FNR==1 {
+                    if (progname) {
+                        printf "\n%s - %s\n%s\n", filename, progname, info
+                    }
+                    progname=""; info=""; filename=FILENAME
+                    sub(".*/", "", filename)
+                }
+                /info_ru:/ { sub(/.*info_ru: /, ""); info=$0 }
+                /PROG_NAME=/ { sub(/.*PROG_NAME=/, ""); progname=$0 }
+                END {
+                    if (progname) {
+                         printf "\n%s - %s\n%s\n", filename, progname, info
+                    }
+                }
+            ' "$dir"/*
+        }
+
+        list_install_scripts "$WH_AUTOINSTALL_DIR" "Список программ с возможностью автоматической установки:"
         echo
-        print_info "Список программ с возможностью установки из существующего дистрибутива:"
+        list_install_scripts "$WH_MANUALINSTALL_DIR" "Список программ с возможностью установки из существующего дистрибутива:"
-        for list in $(ls "$WH_MANUALINSTALL_DIR") ; do
-            AI_INFO="$(grep "info_ru:" "$WH_MANUALINSTALL_DIR/$list" | awk -F"info_ru: " '{print $2}')"
-            AI_PROGNAME="$(grep "PROG_NAME=" "$WH_MANUALINSTALL_DIR/$list" | awk -F"PROG_NAME=" '{print $2}')"
-            echo -e "\n$list - $AI_PROGNAME"
-            echo "$AI_INFO"
-        done
     elif [[ "$INSTALL_SCRIPT" != "0" ]] ; then
         source "$INSTALL_SCRIPT" "$@"
         print_info "Завершена установка $INSTALL_SCRIPT_NAME"