From 5202c56d5c8a8ef3ccb3a2af93a9e12dc129dbe7 Mon Sep 17 00:00:00 2001 From: Hugo Posnic Date: Sun, 21 May 2017 17:56:51 +0200 Subject: [PATCH] Simplify subtitle by removing not useful infos (version and arch) They have nothing to do in manjaro-hello. --- src/manjaro_hello.py | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/src/manjaro_hello.py b/src/manjaro_hello.py index 923c263..74bdf4b 100644 --- a/src/manjaro_hello.py +++ b/src/manjaro_hello.py @@ -5,7 +5,6 @@ import gi import json import locale import os -import subprocess import sys import webbrowser gi.require_version("Gtk", "3.0") @@ -18,6 +17,8 @@ class ManjaroHello(): def __init__(self): # App vars self.app = "manjaro-hello" + system = "Manjaro Gellivara" + dev = False for arg in sys.argv: if arg == "--dev": @@ -54,19 +55,7 @@ class ManjaroHello(): self.window = self.builder.get_object("window") # Subtitle of headerbar - try: - codename = subprocess.Popen("lsb_release -c", stdout=subprocess.PIPE, shell=True).communicate() - codename = codename[0].decode("utf-8") - release = subprocess.Popen("lsb_release -r", stdout=subprocess.PIPE, shell=True).communicate() - release = release[0].decode("utf-8") - if ":" in codename and ":" in release: - codename = codename.split(":")[1].strip().capitalize() - release = release.split(":")[1].strip() - arch = "64-bits" if sys.maxsize > 2**32 else "32-bits" - subtitle = codename + " " + release + " " + arch - self.builder.get_object("headerbar").props.subtitle = subtitle - except subprocess.CalledProcessError as e: - pass + self.builder.get_object("headerbar").props.subtitle = system # Load logo if os.path.isfile(logo_path):