disabled check dependencies if without terminal

testinstall/ksamu

@@ -37,6 +37,6 @@ background_task() {
 }
 
 background_task &
-BG_PID=$!
+WH_BG_PID=$!
-export BG_PID
+export WH_BG_PID
 ' >> "$DRIVE_C/KSAMU/KSAMU.exe.whdb"

winehelper

@@ -210,16 +210,19 @@ su_run () {
 ##### CHECK DEPENDENCIES #####
 # fonts-ttf-ms
 
-if ! rpm -q {i586-,}{wine,glibc-core,libstdc++6,glibc-pthread,glibc-nss,\
+check_deps_i586 () {
-libnm,libnss,libnss-mdns,libnsl1,libunwind,libunixODBC2,ocl-icd,libfreetype,\
+    if [[ $WH_USE_GUI != "1" ]] && [[ -t 0 ]] \
-libcups,libfontconfig1,libgnutls30,libGL,libEGL,libvulkan1,xorg-dri-swrast,\
+    && ! rpm -q {i586-,}{wine,glibc-core,libstdc++6,glibc-pthread,glibc-nss,\
-xorg-dri-intel,xorg-dri-radeon} 1>/dev/null
+    libnm,libnss,libnss-mdns,libnsl1,libunwind,libunixODBC2,ocl-icd,libfreetype,\
-then
+    libcups,libfontconfig1,libgnutls30,libGL,libEGL,libvulkan1,xorg-dri-swrast,\
+    xorg-dri-intel,xorg-dri-radeon} 1>/dev/null
+    then
         if su_run "$DATA_PATH/dependencies.sh"
         then print_info "Зависимости успешно установлены. Продолжаем работу $SCRIPT_NAME"
         else fatal "Не удалось установить зависимости. Работа $SCRIPT_NAME прервана."
         fi
-fi
+    fi
+}
 
 ##### HELPER FUNCTIONS #####
 add_to_var () {
@@ -880,19 +883,26 @@ init_wine_ver () {
             try_download cloud "$download_url" "$wine_package" "check256sum"
             unpack "$wine_package" "$WH_DIST_DIR/"
             try_remove_file "$wine_package"
+        fi
 
         # Управление структурой подкаталога Proton "files", перемещая содержимое вверх
-            if [[ -d "$WINEDIR/files" ]]; then
+        if [[ ${WINEDIR,,} =~ proton ]] \
+        && [[ -d "$WINEDIR/files" ]]
+        then
             print_info "Обнаружена структура каталогов Proton, исправляем пути..."
             mv "$WINEDIR"/files/* "$WINEDIR/"
-                rmdir "$WINEDIR/files"
+            try_remove_dir "$WINEDIR/files"
-            fi
         fi
 
-        [[ ! -f "$WINEDIR/version" ]] && echo "$WH_WINE_USE" > "$WINEDIR/version"
+        if [[ ! -f "$WINEDIR/version" ]] ; then
-        if [[ $WH_WINE_USE =~ wow64 ]]
+            echo "$WH_WINE_USE" > "$WINEDIR/version"
-        then export WH_WINE_WOW64="1"
+        fi
-        else export WH_WINE_WOW64="0"
+
+        if [[ $WH_WINE_USE =~ wow64 ]] ; then
+            export WH_WINE_WOW64="1"
+        else
+            export WH_WINE_WOW64="0"
+            check_deps_i586
         fi
 
         export WINE="$WINEDIR/bin/wine"