Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rework KDE and GNOME version detection logic #395

Merged
merged 1 commit into from
Sep 15, 2024
Merged

Rework KDE and GNOME version detection logic #395

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 20 additions & 13 deletions lib/env_context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,31 +459,38 @@ def is_qtile_running(self):

def get_desktop_env_version(self):
"""logic to set self.DE_MAJ_VER"""
# Desktop environments for which we need the major version:
# - GNOME
# - KDE Plasma

if self.DESKTOP_ENV == 'gnome':
self.DE_MAJ_VER = self.get_gnome_version()
elif self.DESKTOP_ENV == 'kde':
self.DE_MAJ_VER = self.get_kde_version()

if not self.DE_MAJ_VER:
self.DE_MAJ_VER = 'no_logic_for_DE'

def get_gnome_version(self):
try:
# Run the gnome-shell command to get the version
output = subprocess.check_output(["gnome-shell", "--version"]).decode().strip()
# Use regular expression to extract the major version number
match = re.search(r"GNOME Shell (\d+)\.", output)
if match:
self.DE_MAJ_VER = match.group(1)
return match.group(1)
except subprocess.CalledProcessError as proc_err:
error(f"Error obtaining GNOME version: {proc_err}")

elif self.DESKTOP_ENV == 'kde':
self.DE_MAJ_VER = self.get_kde_version()

if not self.DE_MAJ_VER:
self.DE_MAJ_VER = 'no_logic_for_DE'
return 'gnome_ver_check_err'

def get_kde_version(self):
kde_session_version = os.environ.get('KDE_SESSION_VERSION')
if kde_session_version:
if kde_session_version in ['3', '4', '5', '6']:
return kde_session_version
else:
error(f"KDE_SESSION_VERSION contains unrecognized value: '{kde_session_version}'")
KDE_session_ver = os.environ.get('KDE_SESSION_VERSION')
if KDE_session_ver is None:
error(f"KDE_SESSION_VERSION was not set.")
elif KDE_session_ver in ['3', '4', '5', '6']:
return KDE_session_ver
else:
error(f"KDE_SESSION_VERSION contains unrecognized value: '{KDE_session_ver}'")
if shutil.which("kpackagetool6"): # or shutil.which("kwriteconfig6"):
return '6'
elif shutil.which("kpackagetool5"): # or shutil.which("kwriteconfig5"):
Expand Down