X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface-run;h=5c121e6128dcaa250e0bd62b0a53dcdee85db088;hp=f1dadeb2f35ad209fe4996f24d2259a6e79890e9;hb=6a0d39ba688df2efbbf1d21d367200378f09f4a3;hpb=e3ccd419a7d411e01f21988c58b360e093544288 diff --git a/sface-run b/sface-run index f1dadeb..5c121e6 100755 --- a/sface-run +++ b/sface-run @@ -5,7 +5,7 @@ import sys from optparse import OptionParser from PyQt4.QtGui import * -sys.path.append(".") +sys.path.insert(0, ".") exe = os.path.abspath(sys.argv[0]) def using_env(e): @@ -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") - - sys.path.extend([RESOURCES, FRAMEWORKS]) - + 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 + if os.path.exists(RESOURCES): sys.path.insert(0, RESOURCES) + if os.path.exists(FRAMEWORKS): sys.path.insert(0, FRAMEWORKS) elif sys.platform == "linux2": sys.path.extend(["/usr/share", "/usr/share/sface"])