forked from CastroFidel/winehelper
used system winetricks
This commit is contained in:
@@ -106,9 +106,6 @@ else
|
|||||||
check_variables DXVK_NVAPI_LOG_LEVEL "none"
|
check_variables DXVK_NVAPI_LOG_LEVEL "none"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
##### WINETRICKS VERSION #####
|
|
||||||
WINETRICKS_VERSION="20250102"
|
|
||||||
|
|
||||||
##### DEFAULT VARIABLES #####
|
##### DEFAULT VARIABLES #####
|
||||||
WH_VULKAN_LIBDIR="$USER_WORK_PATH/vulkan"
|
WH_VULKAN_LIBDIR="$USER_WORK_PATH/vulkan"
|
||||||
WH_PREFIXES_DIR="$USER_WORK_PATH/prefixes"
|
WH_PREFIXES_DIR="$USER_WORK_PATH/prefixes"
|
||||||
@@ -120,7 +117,7 @@ WH_DB_DIR="$DATA_PATH/database"
|
|||||||
WH_AUTOINSTALL_DIR="$DATA_PATH/autoinstall"
|
WH_AUTOINSTALL_DIR="$DATA_PATH/autoinstall"
|
||||||
WH_MANUALINSTALL_DIR="$DATA_PATH/manualinstall"
|
WH_MANUALINSTALL_DIR="$DATA_PATH/manualinstall"
|
||||||
WH_TESTINSTALL_DIR="$DATA_PATH/testinstall"
|
WH_TESTINSTALL_DIR="$DATA_PATH/testinstall"
|
||||||
WH_WINETRICKS="$DATA_PATH/winetricks_$WINETRICKS_VERSION"
|
WH_WINETRICKS="/usr/bin/winetricks"
|
||||||
|
|
||||||
WH_MENU_DIR="$HOME/.local/share/applications/WineHelper"
|
WH_MENU_DIR="$HOME/.local/share/applications/WineHelper"
|
||||||
|
|
||||||
|
|||||||
@@ -3931,22 +3931,7 @@ class WineHelperGUI(QMainWindow):
|
|||||||
QMessageBox.critical(self, "Ошибка", f"Каталог префикса не найден:\n{prefix_path}")
|
QMessageBox.critical(self, "Ошибка", f"Каталог префикса не найден:\n{prefix_path}")
|
||||||
return
|
return
|
||||||
|
|
||||||
winetricks_search_dir = Var.DATA_PATH
|
winetricks_path = "/usr/bin/winetricks"
|
||||||
winetricks_path = None
|
|
||||||
try:
|
|
||||||
# Ищем файл, который начинается с 'winetricks_'
|
|
||||||
for filename in os.listdir(winetricks_search_dir):
|
|
||||||
if filename.startswith("winetricks_"):
|
|
||||||
winetricks_path = os.path.join(winetricks_search_dir, filename)
|
|
||||||
break # Нашли, выходим из цикла
|
|
||||||
except OSError as e:
|
|
||||||
QMessageBox.critical(self, "Ошибка", f"Не удалось прочитать директорию {winetricks_search_dir}: {e}")
|
|
||||||
return
|
|
||||||
|
|
||||||
if not winetricks_path:
|
|
||||||
QMessageBox.critical(self, "Ошибка", f"Скрипт winetricks не найден в директории:\n{winetricks_search_dir}")
|
|
||||||
return
|
|
||||||
|
|
||||||
wine_executable = self._get_wine_executable_for_prefix(prefix_name)
|
wine_executable = self._get_wine_executable_for_prefix(prefix_name)
|
||||||
dialog = WinetricksManagerDialog(prefix_path, winetricks_path, self, wine_executable=wine_executable)
|
dialog = WinetricksManagerDialog(prefix_path, winetricks_path, self, wine_executable=wine_executable)
|
||||||
dialog.installation_complete.connect(lambda: self.update_prefix_info_display(prefix_name))
|
dialog.installation_complete.connect(lambda: self.update_prefix_info_display(prefix_name))
|
||||||
|
|||||||
19204
winetricks_20250102
19204
winetricks_20250102
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user