From 0a6994abf35cbda58d93ec16003c1eb3b7a6643f Mon Sep 17 00:00:00 2001 From: Sergey Palcheh Date: Fri, 7 Nov 2025 10:50:01 +0600 Subject: [PATCH] fix: winetricks path handling --- winehelper | 7 +++++-- winehelper_gui.py | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/winehelper b/winehelper index 2f848fd..c8aaf2a 100755 --- a/winehelper +++ b/winehelper @@ -7,7 +7,8 @@ if [[ $(id -u) -eq 0 ]] ; then fi ##### DEFAULT PATH ##### -export SCRIPT_NAME USER_WORK_PATH RUN_SCRIPT DATA_PATH CHANGELOG_FILE WH_ICON_PATH LICENSE_FILE AGREEMENT THIRD_PARTY_FILE WH_ICON_TRAY GENERAL +export SCRIPT_NAME USER_WORK_PATH RUN_SCRIPT DATA_PATH CHANGELOG_FILE WH_ICON_PATH \ + LICENSE_FILE AGREEMENT THIRD_PARTY_FILE WH_ICON_TRAY GENERAL WH_WINETRICKS SCRIPT_NAME="$(basename "$0")" if [[ "$(realpath "$0")" == "/usr/bin/$SCRIPT_NAME" ]] ; then @@ -23,6 +24,7 @@ if [[ "$(realpath "$0")" == "/usr/bin/$SCRIPT_NAME" ]] ; then AGREEMENT="/usr/share/doc/winehelper-$WH_VERSION/LICENSE_AGREEMENT" THIRD_PARTY_FILE="/usr/share/doc/winehelper-$WH_VERSION/THIRD-PARTY" GENERAL="/usr/share/doc/winehelper-$WH_VERSION/GENERAL" + WH_WINETRICKS="/usr/bin/winetricks" else # переменные для тестового запуска WineHelper из репозитория USER_WORK_PATH="$HOME/test-$SCRIPT_NAME" @@ -35,8 +37,10 @@ else AGREEMENT="$DATA_PATH/LICENSE_AGREEMENT" THIRD_PARTY_FILE="$DATA_PATH/THIRD-PARTY" GENERAL="$DATA_PATH/GENERAL" + WH_WINETRICKS="/usr/bin/winetricks" WH_DEVEL="1" + # минимальная проверка синтаксиса скриптов for self_check_script in "$RUN_SCRIPT" \ "$DATA_PATH/dependencies.sh" "$DATA_PATH/autoinstall"/* \ @@ -117,7 +121,6 @@ WH_DB_DIR="$DATA_PATH/database" WH_AUTOINSTALL_DIR="$DATA_PATH/autoinstall" WH_MANUALINSTALL_DIR="$DATA_PATH/manualinstall" WH_TESTINSTALL_DIR="$DATA_PATH/testinstall" -WH_WINETRICKS="/usr/bin/winetricks" WH_MENU_DIR="$HOME/.local/share/applications/WineHelper" diff --git a/winehelper_gui.py b/winehelper_gui.py index ca0b876..45841b5 100644 --- a/winehelper_gui.py +++ b/winehelper_gui.py @@ -31,6 +31,7 @@ class Var: LICENSE_AGREEMENT_FILE = os.environ.get("AGREEMENT") THIRD_PARTY_FILE = os.environ.get("THIRD_PARTY_FILE") GENERAL = os.environ.get("GENERAL") + WH_WINETRICKS = os.environ.get("WH_WINETRICKS") class DependencyManager: """Класс для управления проверкой и установкой системных зависимостей.""" @@ -3931,7 +3932,7 @@ class WineHelperGUI(QMainWindow): QMessageBox.critical(self, "Ошибка", f"Каталог префикса не найден:\n{prefix_path}") return - winetricks_path = "/usr/bin/winetricks" + winetricks_path = Var.WH_WINETRICKS wine_executable = self._get_wine_executable_for_prefix(prefix_name) dialog = WinetricksManagerDialog(prefix_path, winetricks_path, self, wine_executable=wine_executable) dialog.installation_complete.connect(lambda: self.update_prefix_info_display(prefix_name))