From 81c1b8a5e65fddec2b57c41c55ca4dc8577ee79c Mon Sep 17 00:00:00 2001 From: Hans L Date: Tue, 13 Mar 2012 22:39:56 -0500 Subject: [PATCH] Search the full path --- SkeinPyPy_NewUI/newui/skeinRun.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/SkeinPyPy_NewUI/newui/skeinRun.py b/SkeinPyPy_NewUI/newui/skeinRun.py index bd1c3c9..8709d21 100644 --- a/SkeinPyPy_NewUI/newui/skeinRun.py +++ b/SkeinPyPy_NewUI/newui/skeinRun.py @@ -7,20 +7,20 @@ from skeinforge_application.skeinforge_utilities import skeinforge_craft def getPyPyExe(): "Return the path to the pypy executable if we can find it. Else return False" if platform.system() == "Windows": + exeName = "pypy.exe" pypyExe = os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../pypy/pypy.exe")); else: + exeName = "pypy" pypyExe = os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../pypy/bin/pypy")); if os.path.exists(pypyExe): return pypyExe - pypyExe = "/bin/pypy"; - if os.path.exists(pypyExe): - return pypyExe - pypyExe = "/usr/bin/pypy"; - if os.path.exists(pypyExe): - return pypyExe - pypyExe = "/usr/local/bin/pypy"; - if os.path.exists(pypyExe): - return pypyExe + + path = os.environ['PATH'] + paths = path.split(os.pathsep) + for p in paths: + pypyExe = os.path.join(p, exeName) + if os.path.exists(pypyExe): + return pypyExe return False def runSkein(fileNames):