[Jython-checkins] SF.net SVN: jython:[6387] trunk/jython

[<pj...@us...>]

Revision: 6387
          http://jython.svn.sourceforge.net/jython/?rev=6387&view=rev
Author:   pjenvey
Date:     2009-05-26 21:57:38 +0000 (Tue, 26 May 2009)

Log Message:
-----------
abspath relative $PRG symlinks so sys.executable can work. fix from jruby
thanks Roland Walter
fixes #1357

Modified Paths:
--------------
    trunk/jython/NEWS
    trunk/jython/src/shell/jython

Modified: trunk/jython/NEWS
===================================================================
--- trunk/jython/NEWS	2009-05-26 19:46:24 UTC (rev 6386)
+++ trunk/jython/NEWS	2009-05-26 21:57:38 UTC (rev 6387)
@@ -1,5 +1,9 @@
 Jython NEWS
 
+Jython 2.5.0
+  Bugs fixed
+    - [ 1357 ] no sys.executable when script runner is a relative link
+
 Jython 2.5.0 rc3
   Bugs fixed
     - [ 1344 ] setName semantics of threading.Thread different to CPython

Modified: trunk/jython/src/shell/jython
===================================================================
--- trunk/jython/src/shell/jython	2009-05-26 19:46:24 UTC (rev 6386)
+++ trunk/jython/src/shell/jython	2009-05-26 21:57:38 UTC (rev 6387)
@@ -29,7 +29,11 @@
   ls=`ls -ld "$PRG"`
   link=`expr "$ls" : '.*-> \(.*\)$'`
   if expr "$link" : '.*/.*' > /dev/null; then
-    PRG="$link"
+    if expr "$link" : '^/' > /dev/null; then
+      PRG="$link"
+    else
+      PRG="`dirname ${PRG}`/${link}"
+    fi
   else
     PRG="`dirname $PRG`/$link"
   fi


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.