napcok
/
manjaro-hello
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve paths vars

merge-requests/64/head
Hugo Posnic 2016-12-26 20:33:54 +01:00
parent 9f95a67400
commit 60b38cb402
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/manjaro_hello.py
View File

@ -18,22 +18,25 @@ class ManjaroHello():
self.app = "manjaro-hello" self.app = "manjaro-hello"
# Path vars # Path vars
self.home_path = os.path.expanduser("~")
manjaro_logo = "/usr/share/icons/manjaro/green/64x64.png"
if os.path.isfile(manjaro_logo):
self.logo_path = manjaro_logo
if os.path.basename(sys.argv[0]) == self.app: if os.path.basename(sys.argv[0]) == self.app:
self.data_path = "/usr/share/" + self.app + "/data/" self.data_path = "/usr/share/" + self.app + "/data/"
self.locale_path = "/usr/share/locale/" self.locale_path = "/usr/share/locale/"
self.ui_path = "/usr/share/" + self.app + "/ui/" self.ui_path = "/usr/share/" + self.app + "/ui/"
self.desktop_path = "/usr/share/applications/" + self.app + ".desktop" self.desktop_path = "/usr/share/applications/" + self.app + ".desktop"
if os.path.isfile("/usr/share/icons/manjaro/green/64x64.png"): if not hasattr(self, 'logo_path'):
self.logo_path = "/usr/share/icons/manjaro/green/64x64.png"
else:
self.logo_path = "/usr/share/" + self.app + "/data/img/manjaro.png" self.logo_path = "/usr/share/" + self.app + "/data/img/manjaro.png"
else: else:
self.data_path = "data/" self.data_path = "data/"
self.locale_path = "locale/" self.locale_path = "locale/"
self.ui_path = "ui/" self.ui_path = "ui/"
self.desktop_path = os.getcwd() + "/" + self.app + ".desktop" self.desktop_path = os.getcwd() + "/" + self.app + ".desktop"
if not hasattr(self, 'logo_path'):
self.logo_path = "data/img/manjaro.png" self.logo_path = "data/img/manjaro.png"
self.config_path = os.path.expanduser("~") + "/.config/" self.config_path = self.home_path + "/.config/"
self.preferences_path = self.config_path + self.app + ".json" self.preferences_path = self.config_path + self.app + ".json"
self.urls_path = self.data_path + "urls.json" self.urls_path = self.data_path + "urls.json"
self.autostart_path = self.config_path + "autostart/" + self.app + ".desktop" self.autostart_path = self.config_path + "autostart/" + self.app + ".desktop"
@ -182,7 +185,7 @@ class ManjaroHello():
elif not autostart and os.path.isfile(self.autostart_path): elif not autostart and os.path.isfile(self.autostart_path):
os.unlink(self.autostart_path) os.unlink(self.autostart_path)
# Specific to i3 # Specific to i3
i3_config = os.path.expanduser("~") + "/.i3/config" i3_config = self.home_path + "/.i3/config"
if os.path.isfile(i3_config): if os.path.isfile(i3_config):
i3_autostart = "exec --no-startup-id " + self.app i3_autostart = "exec --no-startup-id " + self.app
with open(i3_config, "r+") as f: with open(i3_config, "r+") as f: