added check restore_pfx.sh after restor-prefix
This commit is contained in:
14
winehelper
14
winehelper
@@ -101,7 +101,7 @@ if [[ "$1" == "--debug" ]] ; then
|
||||
export DXVK_NVAPI_LOG_LEVEL="error"
|
||||
shift
|
||||
else
|
||||
check_variables WINEDEBUG "-all"
|
||||
check_variables WINEDEBUG "-all,err+all"
|
||||
check_variables DXVK_LOG_LEVEL "none"
|
||||
check_variables VKD3D_SHADER_DEBUG "none"
|
||||
check_variables VKD3D_DEBUG "none"
|
||||
@@ -460,7 +460,7 @@ try_copy_wine_dll_to_pfx_64 () {
|
||||
fi
|
||||
}
|
||||
|
||||
try_copy_wine_dll_to_pfx_32() {
|
||||
try_copy_wine_dll_to_pfx_32 () {
|
||||
if [[ -d "$WINEDIR/lib/wine/i386-windows" ]] ; then
|
||||
WINE_BUILD_DLL_32="$WINEDIR/lib/wine/i386-windows"
|
||||
elif [[ -d "$WINEDIR/lib64/wine/i386-windows" ]] ; then
|
||||
@@ -2097,7 +2097,6 @@ restore_prefix() {
|
||||
local backup_archive_path="$1"
|
||||
local temp_extract_dir prefix_name
|
||||
|
||||
|
||||
if [[ -z "$backup_archive_path" ]] ; then
|
||||
read -e -p "Укажите путь к архиву резервной копии (/путь/к/архиву.whpack): " backup_archive_path
|
||||
backup_archive_path=$(echo "$backup_archive_path" | sed "s/'//g; s/\"//g")
|
||||
@@ -2168,6 +2167,15 @@ restore_prefix() {
|
||||
else
|
||||
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..."
|
||||
export RESTORE_FROM_BACKUP="1" # Устанавливаем флаг восстановления
|
||||
while IFS='=' read -r name_desktop exe_path icon_name ; do
|
||||
|
||||
Reference in New Issue
Block a user