From 0487808469e3ebab8bc5911d7940e348ad2182d9 Mon Sep 17 00:00:00 2001 From: Guillaume Seguin Date: Wed, 5 Sep 2012 15:11:11 +0200 Subject: [PATCH] Improve lookup of files --- printrun/printrun_utils.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/printrun/printrun_utils.py b/printrun/printrun_utils.py index 643add4..725d3cc 100644 --- a/printrun/printrun_utils.py +++ b/printrun/printrun_utils.py @@ -1,4 +1,4 @@ -import os +import os, sys import gettext # Set up Internationalization using gettext @@ -16,18 +16,22 @@ def imagefile(filename): candidate = os.path.join(prefix, filename) if os.path.exists(candidate): return candidate - local_candidate = os.path.join(os.path.dirname(__file__), "images", filename) + local_candidate = os.path.join(os.path.dirname(sys.argv[0]), "images", filename) if os.path.exists(local_candidate): return local_candidate else: - return os.path.join(os.path.split(os.path.split(__file__)[0])[0], "images", filename) + return os.path.join("images", filename) def lookup_file(filename, prefixes): for prefix in prefixes: candidate = os.path.join(prefix, filename) if os.path.exists(candidate): return candidate - return filename + local_candidate = os.path.join(os.path.dirname(sys.argv[0]), filename) + if os.path.exists(local_candidate): + return local_candidate + else: + return filename def pixmapfile(filename): return lookup_file(filename, ['/usr/local/share/pixmaps', '/usr/share/pixmaps'])