diff --git a/winehelper b/winehelper index a2a7d44..131eb59 100755 --- a/winehelper +++ b/winehelper @@ -7,7 +7,7 @@ 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 +export SCRIPT_NAME USER_WORK_PATH RUN_SCRIPT DATA_PATH CHANGELOG_FILE WH_ICON_PATH LICENSE_FILE AGREEMENT THIRD_PARTY_FILE SCRIPT_NAME="$(basename "$0")" if [[ "$(realpath "$0")" == "/usr/bin/$SCRIPT_NAME" ]] ; then @@ -19,6 +19,7 @@ if [[ "$(realpath "$0")" == "/usr/bin/$SCRIPT_NAME" ]] ; then WH_ICON_PATH="$DATA_PATH/image/gui/winehelper.svg" LICENSE_FILE="$(realpath "/usr/share/doc/winehelper"-*/LICENSE)" AGREEMENT="$(realpath "/usr/share/doc/winehelper"-*/LICENSE_AGREEMENT)" + THIRD_PARTY_FILE="$(realpath "/usr/share/doc/winehelper"-*/THIRD_PARTY)" else # переменные для тестового запуска WineHelper из репозитория USER_WORK_PATH="$HOME/test-$SCRIPT_NAME" @@ -28,6 +29,7 @@ else WH_ICON_PATH="$DATA_PATH/image/gui/winehelper-devel.svg" LICENSE_FILE="$DATA_PATH/LICENSE" AGREEMENT="$DATA_PATH/LICENSE_AGREEMENT" + THIRD_PARTY_FILE="$DATA_PATH/THIRD-PARTY" # минимальная проверка синтаксиса скриптов for self_check_script in "$RUN_SCRIPT" \ diff --git a/winehelper_gui.py b/winehelper_gui.py index 3817227..ca1fdf3 100644 --- a/winehelper_gui.py +++ b/winehelper_gui.py @@ -28,6 +28,7 @@ class Var: WH_ICON_PATH = os.environ.get("WH_ICON_PATH") LICENSE_FILE = os.environ.get("LICENSE_FILE") LICENSE_AGREEMENT_FILE = os.environ.get("AGREEMENT") + THIRD_PARTY_FILE = os.environ.get("THIRD_PARTY_FILE") class DependencyManager: """Класс для управления проверкой и установкой системных зависимостей.""" @@ -2819,8 +2820,8 @@ class WineHelperGUI(QMainWindow): # Читаем и парсим файл THIRD-PARTY third_party_html = "" - third_party_file_path = os.path.join(Var.DATA_PATH, "THIRD-PARTY") - if os.path.exists(third_party_file_path): + third_party_file_path = Var.THIRD_PARTY_FILE + if third_party_file_path and os.path.exists(third_party_file_path): with open(third_party_file_path, 'r', encoding='utf-8') as f_tp: third_party_content = f_tp.read()