[meld] bin/meld: Add support for detecting frozen execution
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] bin/meld: Add support for detecting frozen execution
- Date: Thu, 20 Mar 2014 20:35:39 +0000 (UTC)
commit 6ed678f3c61db6c901b57b0545345b7747d174a3
Author: Kai Willadsen <kai willadsen gmail com>
Date: Tue Mar 18 05:47:38 2014 +1000
bin/meld: Add support for detecting frozen execution
bin/meld | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/bin/meld b/bin/meld
index 2cc355d..3690350 100755
--- a/bin/meld
+++ b/bin/meld
@@ -51,10 +51,18 @@ def disable_stdout_buffering():
sys.stdout = Unbuffered(sys.stdout)
-# Support running from an uninstalled version
-if os.path.basename(__file__) == "meld":
- self_path = os.path.realpath(__file__)
-melddir = os.path.abspath(os.path.join(os.path.dirname(self_path), ".."))
+def get_meld_dir():
+ global frozen
+ if frozen:
+ return os.path.dirname(sys.executable)
+
+ # Support running from an uninstalled version
+ if os.path.basename(__file__) == "meld":
+ self_path = os.path.realpath(__file__)
+ return os.path.abspath(os.path.join(os.path.dirname(self_path), ".."))
+
+frozen = getattr(sys, 'frozen', False)
+melddir = get_meld_dir()
uninstalled = False
if os.path.exists(os.path.join(melddir, "meld.doap")):
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]