From bc2edc8d1cb024c93fd7a06692d60893a7aa48c6 Mon Sep 17 00:00:00 2001
From: wheaney <42350981+wheaney@users.noreply.github.com>
Date: Tue, 29 Apr 2025 11:27:24 -0700
Subject: [PATCH] Fix breakages in the breezydesktop and virtualdisplay bin
 files

---
 ui/src/breezydesktop.in  | 14 +++++++-------
 ui/src/virtualdisplay.in | 13 ++++++-------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/ui/src/breezydesktop.in b/ui/src/breezydesktop.in
index b23c408..f7446da 100755
--- a/ui/src/breezydesktop.in
+++ b/ui/src/breezydesktop.in
@@ -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())
diff --git a/ui/src/virtualdisplay.in b/ui/src/virtualdisplay.in
index 882b148..7630de6 100755
--- a/ui/src/virtualdisplay.in
+++ b/ui/src/virtualdisplay.in
@@ -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')