xpamych/winehelper
1
0
Fork 0
forked from CastroFidel/winehelper
Code Pull Requests Activity

added skip check dependencies if wine-wow64 in use

Browse Source
This commit is contained in:
Mikhail Tergoev
2026-01-19 18:47:49 +03:00
parent 4d77861863
commit 4b0fea887b
1 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
winehelper
View File

@@ -210,16 +210,19 @@ su_run () {
##### CHECK DEPENDENCIES #####
# fonts-ttf-ms
if ! rpm -q {i586-,}{wine,glibc-core,libstdc++6,glibc-pthread,glibc-nss,\
libnm,libnss,libnss-mdns,libnsl1,libunwind,libunixODBC2,ocl-icd,libfreetype,\
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 прервана."
check_deps_i586 () {
if [[ $WH_USE_GUI != "1" ]] \
&& ! rpm -q {i586-,}{wine,glibc-core,libstdc++6,glibc-pthread,glibc-nss,\
libnm,libnss,libnss-mdns,libnsl1,libunwind,libunixODBC2,ocl-icd,libfreetype,\
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"
# Управление структурой подкаталога Proton "files", перемещая содержимое вверх
if [[ -d "$WINEDIR/files" ]]; then
print_info "Обнаружена структура каталогов Proton, исправляем пути..."
mv "$WINEDIR"/files/* "$WINEDIR/"
rmdir "$WINEDIR/files"
fi
fi
[[ ! -f "$WINEDIR/version" ]] && echo "$WH_WINE_USE" > "$WINEDIR/version"
if [[ $WH_WINE_USE =~ wow64 ]]
then export WH_WINE_WOW64="1"
else export WH_WINE_WOW64="0"
# Управление структурой подкаталога Proton "files", перемещая содержимое вверх
if [[ ${WINEDIR,,} =~ proton ]] \
&& [[ -d "$WINEDIR/files" ]]
then
print_info "Обнаружена структура каталогов Proton, исправляем пути..."
mv "$WINEDIR"/files/* "$WINEDIR/"
try_remove_dir "$WINEDIR/files"
fi
if [[ ! -f "$WINEDIR/version" ]] ; then
echo "$WH_WINE_USE" > "$WINEDIR/version"
fi
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"