From b54ec812b0b9bb6f9e90a7202b3987c6bb8d47d0 Mon Sep 17 00:00:00 2001 From: Maxim Sobolev Date: Fri, 1 Jun 2001 15:28:29 +0000 Subject: Backout my last backout. Requested by: eivind --- java/linux-jdk13/files/patch-aa | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'java/linux-jdk13/files/patch-aa') diff --git a/java/linux-jdk13/files/patch-aa b/java/linux-jdk13/files/patch-aa index 1ee59bfec964..a382abfe2cd9 100644 --- a/java/linux-jdk13/files/patch-aa +++ b/java/linux-jdk13/files/patch-aa @@ -1,13 +1,13 @@ ---- bin/.java_wrapper.orig Tue Dec 5 15:01:50 2000 -+++ bin/.java_wrapper Tue Dec 5 15:02:20 2000 -@@ -31,8 +31,8 @@ +--- bin/.java_wrapper.orig Fri May 25 14:39:58 2001 ++++ bin/.java_wrapper Fri May 25 14:42:25 2001 +@@ -34,8 +34,8 @@ # Resolve symlinks. See 4152645. while [ -L "$PRG" ]; do - ls=`/bin/ls -ld "$PRG"` -- link=`/usr/bin/expr "$ls" : '.*-> \(.*\)$'` -- if /usr/bin/expr "$link" : '/' > /dev/null; then + ls=`ls -ld "$PRG"` +- link=`expr "$ls" : '.*-> \(.*\)$'` +- if expr "$link" : '/' > /dev/null; then + link=`/compat/linux/usr/bin/expr "$ls" : '.*-> \(.*\)$'` + if /compat/linux/usr/bin/expr "$link" : '/' > /dev/null; then PRG="$link" else - PRG="`/usr/bin/dirname $PRG`/$link" + PRG="`dirname $PRG`/$link" -- cgit v1.2.3