Fix: Run from anywhere

yousseb · Jul 20, 2015 · 966f285 · 966f285
1 parent 2c8e956
commit 966f285
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/meld/meldwindow.py b/meld/meldwindow.py
@@ -253,12 +253,10 @@ def app_action(*args):
         self.widget.connect('focus_out_event', self.on_focus_change)
 
         if is_darwin():
-            print "Will setup MAC integration..."
             self.osx_ready = False
             self.widget.connect('window_state_event', self.osx_menu_setup)
 
     def osx_menu_setup(self, widget, event, callback_data=None):
-        print "osx_menu_setup..."
         if self.osx_ready == False:
             from gi.repository import GtkosxApplication as gtkosx_application
             self.macapp = gtkosx_application.Application()

diff --git a/osx/Meld b/osx/Meld
@@ -3,11 +3,8 @@
 EXEC="exec"
 
 name="`basename $0`"
-if [[ "$0" == `pwd`* ]] || [[ "$0" == "//"* ]]; then
+full_path="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/$name"
-    full_path="$0"
+
-else
-    full_path="`pwd`/$0"
-fi
 tmp=`dirname "$full_path"`
 tmp=`dirname "$tmp"`
 bundle=`dirname "$tmp"`