Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Bug fix to make paths relative to PWD in MacOS app #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 23, 2016
Merged

Bug fix to make paths relative to PWD in MacOS app #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 19 additions & 9 deletions osx/Meld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/env python

import sys
import os
Expand All @@ -7,23 +7,33 @@ import subprocess
def getScriptPath():
return os.path.dirname(os.path.realpath(sys.argv[0]))

def fix_abspath(path):
if not os.path.isabs(path):
cwd = os.environ['PWD']
path = os.path.join(cwd, path)
return os.path.normpath(path)

arglist = []
for arg in sys.argv[1:]:
if arg.startswith('--output'):
filename = arg.split('=')[1]
newArg = '--output=' + os.path.abspath(filename)
newArg = '--output=' + fix_abspath(filename)
elif arg.startswith('-'):
newArg = arg
else:
newArg = os.path.abspath(arg)
newArg = fix_abspath(arg)
arglist.append(newArg)

MELDPATH = getScriptPath() + "/Meld-bin"
APPPATH = os.path.abspath(os.path.join(getScriptPath(), '..'))
MELDPATH = os.path.join(getScriptPath(), "Meld-bin")
APPPATH = fix_abspath(os.path.join(getScriptPath(), '..'))

environment = dict(os.environ,
**{ "DYLD_LIBRARY_PATH" : APPPATH+"/Resources/lib:"+ APPPATH+"/Frameworks",
"LANG": "C"})
environment = dict(os.environ, **{
"DYLD_LIBRARY_PATH": ":".join([
os.path.join(APPPATH, "Resources", "lib"),
os.path.join(APPPATH, "Frameworks")
]),
"LANG": "C"
})

p = subprocess.call([MELDPATH] + arglist, env= environment)
status = subprocess.call([MELDPATH] + arglist, env=environment)
exit(status)