Index: ossp-pkg/shtool/ChangeLog
RCS File: /v/ossp/cvs/ossp-pkg/shtool/ChangeLog,v
rcsdiff -q -kk '-r1.122' '-r1.123' -u '/v/ossp/cvs/ossp-pkg/shtool/ChangeLog,v' 2>/dev/null
--- ChangeLog	2000/06/14 19:01:26	1.122
+++ ChangeLog	2000/06/18 10:48:38	1.123
@@ -10,6 +10,18 @@
  ChangeLog
 
  Changes between 1.4.9 and 1.4.10 (16-Apr-2000 to xx-Jun-2000):
+
+   *) Rewrote the `shtool path -m perl' handling, i.e., the way
+      how to find the most reasonable Perl on a system. It now supports
+      Perl 5.6.0 because we no longer parse `perl -v' output. Instead we
+      base our assumptions on Perl's internal $] variable. Additionally
+      the $PATH position and the executable name is now taken into
+      account, too.
+      [Ralf S. Engelschall]
+
+   *) Fixed shtool.pod: `shtool path -m perl5 perl' is bogus, it has to
+      be just `shtool path -m perl' because the "perl" argument is magic.
+      [Ralf S. Engelschall]
   
    *) Added Python support for `shtool version'.
       [Benjamin Saller <case@appliedtheory.com>]
Index: ossp-pkg/shtool/README
RCS File: /v/ossp/cvs/ossp-pkg/shtool/README,v
rcsdiff -q -kk '-r1.64' '-r1.65' -u '/v/ossp/cvs/ossp-pkg/shtool/README,v' 2>/dev/null
--- README	2000/06/14 18:43:34	1.64
+++ README	2000/06/18 10:48:38	1.65
@@ -10,7 +10,7 @@
   http://www.gnu.org/software/shtool/
   ftp://ftp.gnu.org/gnu/shtool/
 
-  Version 1.4.10 (14-Jun-2000)
+  Version 1.4.10 (18-Jun-2000)
 
   The GNU shtool program is a compilation of small but very stable and
   portable shell scripts into a single shell tool. All ingredients
Index: ossp-pkg/shtool/VERSION
RCS File: /v/ossp/cvs/ossp-pkg/shtool/VERSION,v
rcsdiff -q -kk '-r1.49' '-r1.50' -u '/v/ossp/cvs/ossp-pkg/shtool/VERSION,v' 2>/dev/null
--- VERSION	2000/06/14 18:43:34	1.49
+++ VERSION	2000/06/18 10:48:38	1.50
@@ -1,3 +1,3 @@
 
-  This is GNU shtool, Version 1.4.10 (14-Jun-2000)
+  This is GNU shtool, Version 1.4.10 (18-Jun-2000)
 
Index: ossp-pkg/shtool/sh.path
RCS File: /v/ossp/cvs/ossp-pkg/shtool/sh.path,v
rcsdiff -q -kk '-r1.13' '-r1.14' -u '/v/ossp/cvs/ossp-pkg/shtool/sh.path,v' 2>/dev/null
--- sh.path	2000/06/14 18:39:01	1.13
+++ sh.path	2000/06/18 10:48:38	1.14
@@ -82,25 +82,24 @@
 if [ ".$opt_m" = .yes ] && [ ".$namelist" = .perl ]; then
     rm -f $tmpfile
     touch $tmpfile
-    c=0
     found=0
+    pc=99
     for dir in $paths; do
         dir=`echo $dir | sed -e 's;/*$;;'`
-        for perl in perl5 perl miniperl; do
-             if [ $minusx "$dir/$perl" ] && [ ! -d "$dir/$perl" ]; then
-                 perl="$dir/$perl"
-                 version=`$perl -v | grep version |\
-                          sed -e 's/.* version //' -e 's/ built.*//' -e 's/ with.*//'`
-                 versionnum="`echo $version | sed -e 's/\.//g' -e 's/_//g'`"
-                 versionnum=`expr $versionnum - $c`
-                 echo "$versionnum $perl" >>$tmpfile
+        nc=99
+        for name in perl perl5 miniperl; do
+             if [ $minusx "$dir/$name" ] && [ ! -d "$dir/$name" ]; then
+                 perl="$dir/$name"
+                 pv=`$perl -e 'printf("%.3f", $]);'`
+                 echo "$pv:$pc:$nc:$perl" >>$tmpfile
                  found=1
              fi
+             nc=`expr $nc - 1`
         done
-        c=`expr $c + 1`
+        pc=`expr $pc - 1`
     done
     if [ $found = 1 ]; then
-        perl="`cat $tmpfile | sort -u | tail -1 | cut '-d ' -f2`"
+        perl="`cat $tmpfile | sort -u | tail -1 | cut -d: -f4`"
         rm -f $tmpfile
         echo "$perl"
         exit 0
Index: ossp-pkg/shtool/shtool.pod
RCS File: /v/ossp/cvs/ossp-pkg/shtool/shtool.pod,v
rcsdiff -q -kk '-r1.41' '-r1.42' -u '/v/ossp/cvs/ossp-pkg/shtool/shtool.pod,v' 2>/dev/null
--- shtool.pod	2000/06/14 19:01:26	1.41
+++ shtool.pod	2000/06/18 10:48:38	1.42
@@ -753,7 +753,7 @@
 
  #   shell script
  awk=`shtool path -p "${PATH}:." gawk nawk awk`
- perl=`shtool path -m perl5 perl`
+ perl=`shtool path -m perl`
  cpp=`shtool path -m cpp`
  revpath=`shtool path -r path/to/subdir`