Fix breakages in the breezydesktop and virtualdisplay bin files

This commit is contained in:
wheaney 2025-04-29 11:27:24 -07:00
parent 0415a14ec8
commit bc2edc8d1c
2 changed files with 13 additions and 14 deletions

View File

@ -22,7 +22,13 @@
import os
import sys
lib_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'lib')
xdg_data_home = os.getenv('XDG_DATA_HOME', os.path.join(os.path.expanduser('~'), '.local', 'share'))
appdir = os.getenv('APPDIR', xdg_data_home)
locale_dir = os.path.join(appdir, 'locale')
pkgdatadir = os.path.join(appdir, 'breezydesktop')
sys.path.insert(1, pkgdatadir)
lib_dir = os.path.join(pkgdatadir, 'breezydesktop', 'lib')
sys.path.insert(0, lib_dir)
import signal
@ -31,12 +37,6 @@ import gettext
VERSION = '@VERSION@'
xdg_data_home = os.getenv('XDG_DATA_HOME', os.path.join(os.path.expanduser('~'), '.local', 'share'))
appdir = os.getenv('APPDIR', xdg_data_home)
locale_dir = os.path.join(appdir, 'locale')
pkgdatadir = os.path.join(appdir, 'breezydesktop')
sys.path.insert(1, pkgdatadir)
signal.signal(signal.SIGINT, signal.SIG_DFL)
locale.textdomain('breezydesktop')
locale.setlocale(locale.LC_ALL, locale.getlocale())

View File

@ -23,7 +23,12 @@ import logging
import os
import sys
lib_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'lib')
xdg_data_home = os.getenv('XDG_DATA_HOME', os.path.join(os.path.expanduser('~'), '.local', 'share'))
appdir = os.getenv('APPDIR', xdg_data_home)
pkgdatadir = os.path.join(appdir, 'breezydesktop')
sys.path.insert(1, pkgdatadir)
lib_dir = os.path.join(pkgdatadir, 'breezydesktop', 'lib')
sys.path.insert(0, lib_dir)
from logging.handlers import TimedRotatingFileHandler
@ -52,12 +57,6 @@ import time
VERSION = '@VERSION@'
xdg_data_home = os.getenv('XDG_DATA_HOME', os.path.join(os.path.expanduser('~'), '.local', 'share'))
appdir = os.getenv('APPDIR', xdg_data_home)
locale_dir = os.path.join(appdir, 'locale')
pkgdatadir = os.path.join(appdir, 'breezydesktop')
sys.path.insert(1, pkgdatadir)
import gi
gi.require_version('GLib', '2.0')