forked from CastroFidel/winehelper
Compare commits
3 Commits
b98c6e5408
...
0.5.4.3
Author | SHA1 | Date | |
---|---|---|---|
|
4c39ec3c8e | ||
|
8950d8de2f | ||
|
85bd5fdf5d |
11
winehelper
11
winehelper
@@ -7,18 +7,20 @@ 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
|
||||
# переменные для установленного WineHelper в систему
|
||||
WH_VERSION="$(rpm -q winehelper | awk -F'-' '{print $2}')"
|
||||
USER_WORK_PATH="$HOME/.local/share/$SCRIPT_NAME"
|
||||
RUN_SCRIPT="/usr/bin/$SCRIPT_NAME"
|
||||
DATA_PATH="/usr/share/$SCRIPT_NAME"
|
||||
CHANGELOG_FILE="$(realpath "/usr/share/doc/winehelper"-*/CHANGELOG)"
|
||||
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)"
|
||||
CHANGELOG_FILE="/usr/share/doc/winehelper-$WH_VERSION/CHANGELOG"
|
||||
LICENSE_FILE="/usr/share/doc/winehelper-$WH_VERSION/LICENSE"
|
||||
AGREEMENT="/usr/share/doc/winehelper-$WH_VERSION/LICENSE_AGREEMENT"
|
||||
THIRD_PARTY_FILE="/usr/share/doc/winehelper-$WH_VERSION/THIRD_PARTY"
|
||||
else
|
||||
# переменные для тестового запуска WineHelper из репозитория
|
||||
USER_WORK_PATH="$HOME/test-$SCRIPT_NAME"
|
||||
@@ -28,6 +30,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" \
|
||||
|
@@ -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()
|
||||
|
||||
|
Reference in New Issue
Block a user