CHANGELOG

@@ -1,12 +1,5 @@
 История изменений:
 
-0.3.2:
-* обновлена автоустановка "Альта-Максимум"
-* исправлен запуск установленных программ аргументом "run"
-Пример: "winehelper run БК.exe"
-* добавлен аргумент "--debug" для запуска в режиме создания лога
-Пример: "winehelper --debug run БК.exe"
-
 0.3.1:
 * добавлен вывод ошибки, если установочного файла не существует
 * исправлена тихая установка нескольких приложений "Альта-Софт" в один префикс и каталог

THIRD-PARTY

@@ -1,22 +0,0 @@
-WINE:
-https://gitlab.winehq.org/wine/wine
-https://gitlab.winehq.org/wine/wine-staging
-https://github.com/ValveSoftware/Proton
-https://github.com/Kron4ek/wine-tkg
-https://git.altlinux.org/gears/w/wine.git
-
-WINE-MONO:
-https://gitlab.winehq.org/mono/wine-mono
-
-WINE-GECKO:
-https://gitlab.winehq.org/wine/wine-gecko
-
-DXVK:
-https://github.com/doitsujin/dxvk
-
-VKD3D:
-https://gitlab.winehq.org/wine/vkd3d
-https://github.com/HansKristian-Work/vkd3d-proton
-
-WINETRICKS:
-https://github.com/Winetricks/winetricks

autoinstall/alta-maximum

@@ -10,20 +10,19 @@ export WH_WINDOWS_VER="10"
 export WINEARCH="win32"
 export INSTALL_DLL="corefonts eufonts lucida opensymbol tahoma cjkfonts vb6run mdac28 msxml3 msxml4 msxml6 mfc42 jet40 native_oleaut32"
 
-ALTA_VERSION="120325"
+AUTOINSTALL_EXE="${WH_TMP_DIR}/maximum100325.zip"
-AUTOINSTALL_EXE="${WH_TMP_DIR}/maximum${ALTA_VERSION}.zip"
+AUTOINSTALL_UNPACK="${WH_TMP_DIR}/maximum100325"
-AUTOINSTALL_UNPACK="${WH_TMP_DIR}/maximum${ALTA_VERSION}"
+AUTOINSTALL_SETUP="${WH_TMP_DIR}/maximum100325/setup.exe"
-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
+if try_download "https://www2.alta.ru/pub/packets/distr/maximum100325.zip" "${AUTOINSTALL_EXE}" ; then
     7z x -y "${AUTOINSTALL_EXE}" -o"${AUTOINSTALL_UNPACK}"
     try_remove_file "$AUTOINSTALL_EXE"
 
     wine_run_install "${AUTOINSTALL_SETUP}" /S /OVERWRITE
     try_remove_dir "$AUTOINSTALL_UNPACK"
 
-    ALTA_PATH="$DRIVE_C/ALTA"
+    ALTA_PATH="$DRIVE_C/Alta"
     create_desktop "Альта-ГТД" "$ALTA_PATH/gtdw.exe" "altagtd"
     create_desktop "Таможенные документы" "$ALTA_PATH/ordview.exe" "altatamdoc"
     create_desktop "Такса" "$ALTA_PATH/taxwin.exe" "altatax"

winehelper

@@ -11,24 +11,12 @@ print_error () { printf "\E[31m%s Ошибка: $@ %s\e[0m\n" ;}
 print_warning () { printf "\E[33m%s Предупреждение: $@ %s\e[0m\n" ;}
 print_info () { printf "\E[36m%s Информация: \"$@\" %s\e[0m\n" ;}
 print_ok () { printf "\E[35m%s Успех: $@ %s\e[0m\n" ;}
-print_var () { for vp in $@ ; do echo "${vp}=${!vp}" ; done ;}
+print_var () { for vp in $@ ; do print_info "${vp}=${!vp}" ; done ;}
 fatal () { print_error "$@" ; exit 1 ;}
 
 ##### CHECK VARIABLES #####
 check_variables () { [[ -z ${!1} ]] && export $1="$2" ;}
 
-##### CHECK DEBUG #####
-if [[ "$1" == "--debug" ]] ; then
-    export DEBUG="full"
-    export LOG_FILE="$HOME/winehelper.log"
-    shift
-    print_warning "Включен режим подробного логирования работы WINE."
-    print_warning "Лог будет сохранен по пути: $LOG_FILE"
-    sleep 3
-else
-    check_variables DEBUG "0"
-fi
-
 ##### DEFAULT VARIABLES #####
 SCRIPT_NAME="$(basename "$0")"
 if [[ "$(realpath "$0")" == "/usr/bin/$SCRIPT_NAME" ]] ; then
@@ -65,6 +53,8 @@ check_variables WINE_DO_NOT_CREATE_DXGI_DEVICE_MANAGER "0"
 check_variables WINE_HEAP_DELAY_FREE "0"
 check_variables WINE_ALLOW_XIM "0"
 
+check_variables DEBUG 0
+
 check_variables WH_WINDOWS_VER "10"
 # check_variables WH_USE_GSTREAMER "1"
 # check_variables WH_USE_D3D_EXTRAS "1"
@@ -433,6 +423,8 @@ check_installed_programs () {
                 elif [[ "$EXE_PATH" =~ ${2}$ ]] ; then
                     export EXE_PATH
                     return 0
+                else
+                    fatal "Не найден файл запуска для $2"
                 fi
             ;;
             *)
@@ -444,7 +436,6 @@ check_installed_programs () {
             ;;
         esac
     done
-    [[ -n $2 ]] && fatal "Не найден файл запуска для $2"
 }
 
 run_installed_programs () {
@@ -612,9 +603,10 @@ init_wine_ver () {
     check_variables VKBASALT_LOG_LEVEL "none"
     check_variables DXVK_NVAPI_LOG_LEVEL "none"
 
-    if [[ $DEBUG == "0" ]] ; then
+    if [[ $DEBUG == 0 ]] ; then
         check_variables WINEDEBUG "-all"
-    elif [[ $DEBUG == "full" ]] ; then
+        export WH_WDBG='2>/dev/null'
+    elif [[ $DEBUG == full ]] ; then
         check_variables WINEDEBUG "+loaddll,+seh"
         export DXVK_LOG_LEVEL="error"
         export VKD3D_DEBUG "error"
@@ -622,8 +614,10 @@ init_wine_ver () {
         export VK_LOADER_DEBUG "error"
         export VKBASALT_LOG_LEVEL "error"
         export DXVK_NVAPI_LOG_LEVEL "error"
+        export WH_WDBG=""
     else
         check_variables WINEDEBUG "err+all"
+        export WH_WDBG=""
     fi
 
     print_info "Используется версия wine: $WH_WINE_USE"
@@ -836,16 +830,11 @@ prepair_wine () {
 }
 
 wine_run () {
+    print_var WINEPREFIX WINEDLLOVERRIDES WH_WINDOWS_VER
     WIN_FILE_PATH="$(dirname "$WIN_FILE_EXEC")"
     [[ -d "$WIN_FILE_PATH" ]] && cd "$WIN_FILE_PATH"
 
-    if [[ $DEBUG == "0" ]] ; then
+    $MANGOHUD_RUN "$WINELOADER" "$@" $LAUNCH_PARAMETERS
-        $MANGOHUD_RUN "$WINELOADER" "$@" $LAUNCH_PARAMETERS
-    else
-        print_var WH_WINE_USE WINEARCH WINEPREFIX WINEDLLOVERRIDES WH_WINDOWS_VER | tee "$LOG_FILE"
-        $MANGOHUD_RUN "$WINELOADER" "$@" $LAUNCH_PARAMETERS 2>&1 | tee -a "$LOG_FILE"
-    fi
-
     wait_wineserver
 }
 
@@ -901,7 +890,6 @@ wh_info () {
 Параметры:
     --help                            показать эту справку и выйти
     --version                         показать информацию о пакете и его версии
-    --debug [команда]                 включить режим логирования работы WINE
 
 "
 }