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

added check restore_pfx.sh after restor-prefix

Browse Source
This commit is contained in:
Mikhail Tergoev
2025-11-26 13:17:27 +03:00
parent 5953d4b122
commit cbf0bdbf8a
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
winehelper
View File

@@ -101,7 +101,7 @@ if [[ "$1" == "--debug" ]] ; then
export DXVK_NVAPI_LOG_LEVEL="error" export DXVK_NVAPI_LOG_LEVEL="error"
shift shift
else else
check_variables WINEDEBUG "-all" check_variables WINEDEBUG "-all,err+all"
check_variables DXVK_LOG_LEVEL "none" check_variables DXVK_LOG_LEVEL "none"
check_variables VKD3D_SHADER_DEBUG "none" check_variables VKD3D_SHADER_DEBUG "none"
check_variables VKD3D_DEBUG "none" check_variables VKD3D_DEBUG "none"
@@ -460,7 +460,7 @@ try_copy_wine_dll_to_pfx_64 () {
fi fi
} }
try_copy_wine_dll_to_pfx_32() { try_copy_wine_dll_to_pfx_32 () {
if [[ -d "$WINEDIR/lib/wine/i386-windows" ]] ; then if [[ -d "$WINEDIR/lib/wine/i386-windows" ]] ; then
WINE_BUILD_DLL_32="$WINEDIR/lib/wine/i386-windows" WINE_BUILD_DLL_32="$WINEDIR/lib/wine/i386-windows"
elif [[ -d "$WINEDIR/lib64/wine/i386-windows" ]] ; then elif [[ -d "$WINEDIR/lib64/wine/i386-windows" ]] ; then
@@ -2097,7 +2097,6 @@ restore_prefix() {
local backup_archive_path="$1" local backup_archive_path="$1"
local temp_extract_dir prefix_name local temp_extract_dir prefix_name
if [[ -z "$backup_archive_path" ]] ; then if [[ -z "$backup_archive_path" ]] ; then
read -e -p "Укажите путь к архиву резервной копии (/путь/к/архиву.whpack): " backup_archive_path read -e -p "Укажите путь к архиву резервной копии (/путь/к/архиву.whpack): " backup_archive_path
backup_archive_path=$(echo "$backup_archive_path" | sed "s/'//g; s/\"//g") backup_archive_path=$(echo "$backup_archive_path" | sed "s/'//g; s/\"//g")
@@ -2168,6 +2167,15 @@ restore_prefix() {
else else
print_ok "Префикс $prefix_name восстановлен." print_ok "Префикс $prefix_name восстановлен."
export WINEPREFIX="$WH_PREFIXES_DIR/$prefix_name"
if [[ -f "$WINEPREFIX/last.conf" ]] ; then
source "$WINEPREFIX/last.conf"
prepair_wine
if [[ -f "$WINEPREFIX/restore_pfx.sh" ]] ; then
source "$WINEPREFIX/restore_pfx.sh"
fi
fi
print_info "Восстановление ярлыков для префикса $prefix_name..." print_info "Восстановление ярлыков для префикса $prefix_name..."
export RESTORE_FROM_BACKUP="1" # Устанавливаем флаг восстановления export RESTORE_FROM_BACKUP="1" # Устанавливаем флаг восстановления
while IFS='=' read -r name_desktop exe_path icon_name ; do while IFS='=' read -r name_desktop exe_path icon_name ; do