git://git.onelab.eu
/
sface.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e3ccd41
)
append instead of extend
author
Barış Metin
<Talip-Baris.Metin@sophia.inria.fr>
Mon, 27 Sep 2010 14:13:30 +0000
(16:13 +0200)
committer
Barış Metin
<Talip-Baris.Metin@sophia.inria.fr>
Mon, 27 Sep 2010 14:13:30 +0000
(16:13 +0200)
sface-run
patch
|
blob
|
history
diff --git
a/sface-run
b/sface-run
index
f1dadeb
..
eecabd2
100755
(executable)
--- a/
sface-run
+++ b/
sface-run
@@
-30,9
+30,7
@@
if sys.platform == "darwin":
CONTENTS = os.path.dirname(DIR)
RESOURCES = os.path.join(CONTENTS, "Resources")
FRAMEWORKS = os.path.join(CONTENTS, "Frameworks")
CONTENTS = os.path.dirname(DIR)
RESOURCES = os.path.join(CONTENTS, "Resources")
FRAMEWORKS = os.path.join(CONTENTS, "Frameworks")
-
- sys.path.extend([RESOURCES, FRAMEWORKS])
-
+
DYLD_FRAMEWORK_PATH = FRAMEWORKS
DYLD_LIBRARY_PATH = RESOURCES
PATH = os.getenv("PATH")
DYLD_FRAMEWORK_PATH = FRAMEWORKS
DYLD_LIBRARY_PATH = RESOURCES
PATH = os.getenv("PATH")
@@
-42,6
+40,8
@@
if sys.platform == "darwin":
os.environ["PATH"] = PATH
os.environ["DYLD_LIBRARY_PATH"] = DYLD_LIBRARY_PATH
os.environ["DYLD_FRAMEWORK_PATH"] = DYLD_FRAMEWORK_PATH
os.environ["PATH"] = PATH
os.environ["DYLD_LIBRARY_PATH"] = DYLD_LIBRARY_PATH
os.environ["DYLD_FRAMEWORK_PATH"] = DYLD_FRAMEWORK_PATH
+ if os.path.exists(RESOURCES): sys.path.append(RESOURCES)
+ if os.path.exists(FRAMEWORKS): sys.path.append(FRAMEWORKS)
elif sys.platform == "linux2":
sys.path.extend(["/usr/share", "/usr/share/sface"])
elif sys.platform == "linux2":
sys.path.extend(["/usr/share", "/usr/share/sface"])