Bug 456719 run-mozilla.sh doesn't work well with ksh93 r=benjamin

build/unix/mozilla.in

@@ -67,6 +67,8 @@ else
   while [ -h "$progname" ]; do
     bn=`basename "$progname"`
     cd `dirname "$progname"`
+    # Resolve symlink of dirname
+    cd `/bin/pwd`
     progname=`/bin/ls -l "$bn" | sed -e 's/^.* -> //' `
     progbase=`basename "$progname"`
     if [ ! -x "$progname" ]; then
@@ -76,7 +78,7 @@ else
     run_moz="$curdir/run-mozilla.sh"
     if [ -x "$run_moz" ]; then
       cd "$curdir"
-      dist_bin=`pwd`
+      dist_bin=`/bin/pwd`
       run_moz="$dist_bin/run-mozilla.sh"
       found=1
       break

build/unix/run-mozilla.sh

@@ -110,12 +110,12 @@ moz_get_debugger()
 	done="no"
 	for d in $debuggers
 	do
-		moz_test_binary /bin/type
+		moz_test_binary /bin/which
 		if [ $? -eq 1 ]
 		then
-			dpath=`LC_MESSAGES=C type ${d} | awk '{print $3;}' | sed -e 's/\.$//'`	
-		else 	
 			dpath=`which ${d}`	
+		else 	
+			dpath=`LC_MESSAGES=C type ${d} | awk '{print $3;}' | sed -e 's/\.$//'`	
 		fi
 		if [ -x "$dpath" ]
 		then
@@ -156,12 +156,12 @@ moz_debug_program()
 	fi
 	if [ -n "$moz_debugger" ]
 	then
-		moz_test_binary /bin/type
+		moz_test_binary /bin/which
 		if [ $? -eq 1 ]
 		then	
-			debugger=`LC_MESSAGES=C type $moz_debugger | awk '{print $3;}' | sed -e 's/\.$//'` 
-		else
 			debugger=`which $moz_debugger` 
+		else
+			debugger=`LC_MESSAGES=C type $moz_debugger | awk '{print $3;}' | sed -e 's/\.$//'` 
 		fi	
 	else
 		debugger=`moz_get_debugger`