Setting tag sface-0.1-5

[sface.git] / sface-run

diff --git a/sface-run b/sface-run
index 84afd0c..48650dc 100755 (executable)
--- a/sface-run
+++ b/sface-run
@@ -3,16 +3,15 @@
 import os
 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):
     print "Using %s = %s" % (e, os.environ[e])
 
-def print_env(options):
-    if not options.verbose:
+def print_env(config):
+    if not config.verbose:
         return
 
     if sys.platform == "darwin":
@@ -30,9 +29,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,11 +39,14 @@ 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"])
 
 
+from PyQt4.QtGui import *
 from sface.mainwindow import MainWindow
 from sface.config import config
 
@@ -101,5 +101,5 @@ if __name__ == "__main__":
     (options,args)=parser.parse_args()
     config.update_from_OptionParser(options)
     config.display("After command-line")
-    print_env(options)
+    print_env(config)
     main(sys.argv)