upgrade to latest GNU shtool snapshot for better RHL/RHEL detection and naming

openpkg/HISTORY

@@ -2,6 +2,7 @@
 2004
 ====
 
+20040121 upgrade to latest GNU shtool snapshot for better RHL/RHEL detection and naming
 20040121 cleanup openpkg.spec by sorting SourceX headers
 20040120 add OSSP uuid and companion uuid.sh frontend to provide new <prefix>/etc/openpkg/uuid
 20040120 embed %post section from openpkg.spec into bootstrap script *.src.sh

openpkg/shtool

@@ -1,7 +1,7 @@
 #!/bin/sh
 ##
 ##  GNU shtool -- The GNU Portable Shell Tool
-##  Copyright (c) 1994-2003 Ralf S. Engelschall <rse@engelschall.com>
+##  Copyright (c) 1994-2004 Ralf S. Engelschall <rse@engelschall.com>
 ##
 ##  See http://www.gnu.org/software/shtool/ for more information.
 ##  See ftp://ftp.gnu.org/gnu/shtool/ for latest version.
@@ -66,7 +66,7 @@ if [ $# -eq 0 ]; then
 fi
 if [ ".$1" = ".-h" ] || [ ".$1" = ".--help" ]; then
     echo "This is GNU shtool, version 2.0b0 (13-Dec-2003)"
-    echo "Copyright (c) 1994-2003 Ralf S. Engelschall <rse@engelschall.com>"
+    echo "Copyright (c) 1994-2004 Ralf S. Engelschall <rse@engelschall.com>"
     echo "Report bugs to <bug-shtool@gnu.org>"
     echo ''
     echo "Usage: shtool [<options>] [<cmd-name> [<cmd-options>] [<cmd-args>]]"
@@ -608,7 +608,7 @@ case $tool in
 echo )
     ##
     ##  echo -- Print string with optional construct expansion
-    ##  Copyright (c) 1998-2003 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1998-2004 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for WML as buildinfo
     ##
     
@@ -1030,7 +1030,7 @@ mdate )
 table )
     ##
     ##  table -- Pretty-print a field-separated list as a table
-    ##  Copyright (c) 1998-2003 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1998-2004 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for Apache
     ##
     
@@ -1094,7 +1094,7 @@ table )
 prop )
     ##
     ##  prop -- Display progress with a running propeller
-    ##  Copyright (c) 1998-2003 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1998-2004 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for mod_ssl
     ##
     
@@ -1139,7 +1139,7 @@ prop )
 move )
     ##
     ##  move -- Move files with simultaneous substitution
-    ##  Copyright (c) 1999-2003 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1999-2004 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for shtool
     ##
     
@@ -1231,7 +1231,7 @@ move )
 install )
     ##
     ##  install -- Install a program, script or datafile
-    ##  Copyright (c) 1997-2003 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1997-2004 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for shtool
     ##
     
@@ -1393,7 +1393,7 @@ install )
 mkdir )
     ##
     ##  mkdir -- Make one or more directories
-    ##  Copyright (c) 1996-2003 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1996-2004 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for public domain by Noah Friedman <friedman@prep.ai.mit.edu>
     ##  Cleaned up and enhanced for shtool
     ##
@@ -1482,7 +1482,7 @@ mkdir )
 mkln )
     ##
     ##  mkln -- Make link with calculation of relative paths
-    ##  Copyright (c) 1999-2003 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1999-2004 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for shtool
     ##
     
@@ -1632,7 +1632,7 @@ mkln )
 mkshadow )
     ##
     ##  mkshadow -- Make a shadow tree through symbolic links
-    ##  Copyright (c) 1998-2003 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1998-2004 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for Apache
     ##
     
@@ -1749,7 +1749,7 @@ mkshadow )
 fixperm )
     ##
     ##  fixperm -- Fix file permissions inside a source tree
-    ##  Copyright (c) 1996-2003 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1996-2004 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for ePerl
     ##
     
@@ -1805,7 +1805,7 @@ fixperm )
 rotate )
     ##
     ##  rotate -- Logfile rotation
-    ##  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 2001-2004 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for use in OpenPKG
     ##
     
@@ -2168,7 +2168,7 @@ rotate )
 tarball )
     ##
     ##  tarball -- Roll distribution tarballs
-    ##  Copyright (c) 1999-2003 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1999-2004 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for shtool
     ##
     
@@ -2331,7 +2331,7 @@ tarball )
 subst )
     ##
     ##  subst -- Apply sed(1) substitution operations
-    ##  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 2001-2004 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for OpenPKG's rpmtool
     ##
     
@@ -2469,7 +2469,7 @@ subst )
 platform )
     ##
     ##  platform -- Platform Identification Utility
-    ##  Copyright (c) 2003 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 2003-2004 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for use in OpenPKG
     ##
     
@@ -2662,29 +2662,28 @@ platform )
                            -e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/' \
                            -e 's/^#[^0-9]*\([0-9][0-9]*\).*$/\1/' \
                            -e 's/^#.*$//'`
-                    t=""
-                    if [ ".${n}" = .redhat ]; then
-                        t=`head -1 /etc/${tagfile} | \
-                           sed -e 's/^/#/' \
-                               -e 's/^#.*Red Hat Enterprise Linux \([AEW]S\).*$/\1/' \
-                               -e 's/^#.*$//'`
-                    fi
                     case "`util_lower ${n}`" in
-                        debian      ) n="Debian[ GNU/Linux]" ;;
-                        fedora      ) n="Fedora[ GNU/Linux]" ;;
-                        redhat      ) n="RedHat[ Linux]"     ;;
-                        suse        ) n="SuSE[ Linux]"       ;;
-                        mandrake    ) n="Mandrake[ Linux]"   ;;
-                        gentoo      ) n="Gentoo[ Linux]"     ;;
-                        slackware   ) n="Slackware[ Linux]"  ;;
-                        turbolinux  ) n="TurboLinux"         ;;
-                        unitedlinux ) n="UnitedLinux"        ;;
-                        *           ) n="${n}[ GNU/Linux]"   ;;
+                        redhat )
+                            if [ ".`grep 'Red Hat Enterprise Linux' /etc/${tagfile}`" != . ]; then
+                                n="<R>ed <H>at <E>nterprise <L>inux"
+                            else
+                                n="<R>ed <H>at <L>inux"
+                            fi
+                            ;;
+                        debian      ) n="Debian[ GNU/Linux]"        ;;
+                        fedora      ) n="<Fedora> Core[ GNU/Linux]" ;;
+                        suse        ) n="SuSE[ Linux]"              ;;
+                        mandrake    ) n="Mandrake[ Linux]"          ;;
+                        gentoo      ) n="Gentoo[ GNU/Linux]"        ;;
+                        slackware   ) n="Slackware[ Linux]"         ;;
+                        turbolinux  ) n="TurboLinux"                ;;
+                        unitedlinux ) n="UnitedLinux"               ;;
+                        *           ) n="${n}[ GNU/Linux]"          ;;
+                    esac
+                    case "$n" in
+                        *"<"*">"* ) SP="$n <$v>" ;;
+                        *         ) SP="$n $v"   ;;
                     esac
-                    if [ ".${t}" != . ]; then
-                        n="${n} ${t}"
-                    fi
-                    SP="$n $v"
                     break
                 done
             fi
@@ -2952,7 +2951,7 @@ platform )
                     val_C=`echo ":$val" | \
                            sed -e 's/^://' \
                                -e 's;\[\([^]]*\)\];;g' \
-                               -e 's;[^<]*<\([^>]*\)>;\1;g' \
+                               -e 's;[^<]*<\([^>]*\)>[^<]*;\1;g' \
                                -e "s; ;§§;g" \
                                -e "s;/;%%;g" \
                                -e "s;§§;${opt_S};g" \
@@ -3012,7 +3011,7 @@ platform )
 arx )
     ##
     ##  arx -- Extended archive command
-    ##  Copyright (c) 1999-2003 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1999-2004 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for shtool
     ##
     
@@ -3090,7 +3089,7 @@ arx )
 slo )
     ##
     ##  slo -- Separate linker options by library class
-    ##  Copyright (c) 1998-2003 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1998-2004 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for Apache
     ##
     
@@ -3248,7 +3247,7 @@ slo )
 scpp )
     ##
     ##  scpp -- Sharing C Pre-Processor
-    ##  Copyright (c) 1999-2003 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1999-2004 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for GNU Pth
     ##
     
@@ -3467,7 +3466,7 @@ scpp )
 version )
     ##
     ##  version -- Maintain a version information file
-    ##  Copyright (c) 1994-2003 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1994-2004 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for ePerl, rewritten from scratch for shtool
     ##
     
@@ -3745,7 +3744,7 @@ version )
 path )
     ##
     ##  path -- Deal with program paths
-    ##  Copyright (c) 1998-2003 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1998-2004 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for Apache
     ##