[Vm-dev] [commit] r2209 - realpath handles absolute and relative symlinks in npsqueakrun

[commits at squeakvm.org]

Author: piumarta
Date: 2010-05-13 14:18:47 -0700 (Thu, 13 May 2010)
New Revision: 2209

Modified:
   trunk/platforms/unix/ChangeLog
   trunk/platforms/unix/npsqueak/npsqueakrun.in
Log:
realpath handles absolute and relative symlinks in npsqueakrun

Modified: trunk/platforms/unix/ChangeLog
===================================================================
--- trunk/platforms/unix/ChangeLog	2010-05-13 21:16:10 UTC (rev 2208)
+++ trunk/platforms/unix/ChangeLog	2010-05-13 21:18:47 UTC (rev 2209)
@@ -1,5 +1,8 @@
 2010-05-13  Ian Piumarta  <com -dot- gmail -at- piumarta (backwards)>
 
+	* npsqueak/npsqueakrun.in (realpath): prepend dir to link target
+	iff target is relative.
+
 	* cmake/squeak.in (wrapper): Don't echo the environment.
 
 	* CMakeLists.txt: Add subdir npsqueak.
@@ -13,8 +16,8 @@
 	* npsqueak/npsqueakregister.in (NPSQUEAK_SO): Construct from
 	substituted cmake variables.
 
-	* cmake/squeak.in (PATH): realpath() prepends dir to link target
-	iff target is relative.  Only echo environment if SQUEAK_DEBUG is
+	* cmake/squeak.in (realpath): prepend dir to link target iff
+	target is relative.  Only echo environment if SQUEAK_DEBUG is
 	nonzero.
 
 2010-05-11  Ian Piumarta  <com -dot- gmail -at- piumarta (backwards)>

Modified: trunk/platforms/unix/npsqueak/npsqueakrun.in
===================================================================
--- trunk/platforms/unix/npsqueak/npsqueakrun.in	2010-05-13 21:16:10 UTC (rev 2208)
+++ trunk/platforms/unix/npsqueak/npsqueakrun.in	2010-05-13 21:18:47 UTC (rev 2209)
@@ -25,6 +25,9 @@
 	dir=`cd "${dir}" && pwd -P`
 	path=`basename "${path}"`
 	path=`ls -l "${dir}/${path}" | sed 's,.* -> ,,'`
+	if test `expr "${path}" : "/"` -eq 0; then
+	    path="${dir}/${path}"
+	fi
     done
     if test -d "${path}"; then
 	(cd "${path}" && pwd -P)