texinfo update (Mon Jul 5 09:22:01 EDT 2004)

[Karl Berry]

Index: install-sh
===================================================================
RCS file: /cvsroot/texinfo/texinfo/install-sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** install-sh  11 Apr 2004 17:56:45 -0000      1.7
--- install-sh  5 Jul 2004 13:12:26 -0000       1.8
***************
*** 1,7 ****
  #!/bin/sh
  # install - install a program, script, or datafile
  
! scriptversion=2004-04-01.17
  
  # This originates from X11R5 (mit/util/scripts/install.sh), which was
  # later released in X11R6 (xc/config/util/install.sh) with the
--- 1,7 ----
  #!/bin/sh
  # install - install a program, script, or datafile
  
! scriptversion=2004-07-05.00
  
  # This originates from X11R5 (mit/util/scripts/install.sh), which was
  # later released in X11R6 (xc/config/util/install.sh) with the
***************
*** 58,66 ****
  rmprog="${RMPROG-rm}"
  mkdirprog="${MKDIRPROG-mkdir}"
  
- transformbasename=
- transform_arg=
- instcmd="$mvprog"
  chmodcmd="$chmodprog 0755"
  chowncmd=
  chgrpcmd=
--- 58,63 ----
***************
*** 70,92 ****
  src=
  dst=
  dir_arg=
  
! usage="Usage: $0 [OPTION]... SRCFILE DSTFILE
     or: $0 [OPTION]... SRCFILES... DIRECTORY
!    or: $0 -d DIRECTORIES...
  
! In the first form, install SRCFILE to DSTFILE, removing SRCFILE by default.
! In the second, create the directory path DIR.
  
  Options:
! -b=TRANSFORMBASENAME
! -c         copy source (using $cpprog) instead of moving (using $mvprog).
  -d         create directories instead of installing files.
! -g GROUP   $chgrp installed files to GROUP.
! -m MODE    $chmod installed files to MODE.
! -o USER    $chown installed files to USER.
! -s         strip installed files (using $stripprog).
! -t=TRANSFORM
  --help     display this help and exit.
  --version  display version info and exit.
  
--- 67,93 ----
  src=
  dst=
  dir_arg=
+ dstarg=
+ no_target_directory=
  
! usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
     or: $0 [OPTION]... SRCFILES... DIRECTORY
!    or: $0 [OPTION]... -t DIRECTORY SRCFILES...
!    or: $0 [OPTION]... -d DIRECTORIES...
  
! In the 1st form, copy SRCFILE to DSTFILE.
! In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
! In the 4th, create DIRECTORIES.
  
  Options:
! -c         (ignored)
  -d         create directories instead of installing files.
! -g GROUP   $chgrpprog installed files to GROUP.
! -m MODE    $chmodprog installed files to MODE.
! -o USER    $chownprog installed files to USER.
! -s         $stripprog installed files.
! -t DIRECTORY  install into DIRECTORY.
! -T         report an error if DSTFILE is a directory.
  --help     display this help and exit.
  --version  display version info and exit.
  
***************
*** 96,107 ****
  
  while test -n "$1"; do
    case $1 in
!     -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
!         shift
!         continue;;
! 
!     -c) instcmd=$cpprog
!         shift
          continue;;
  
      -d) dir_arg=true
--- 97,103 ----
  
  while test -n "$1"; do
    case $1 in
!     -c) shift
          continue;;
  
      -d) dir_arg=true
***************
*** 129,142 ****
          shift
          continue;;
  
!     -t=*) transformarg=`echo $1 | sed 's/-t=//'`
!         shift
!         continue;;
  
      --version) echo "$0 $scriptversion"; exit 0;;
  
      *)  # When -d is used, all remaining arguments are directories to create.
!       test -n "$dir_arg" && break
          # Otherwise, the last argument is the destination.  Remove it from 
address@hidden
        for arg
        do
--- 125,144 ----
          shift
          continue;;
  
!     -t) dstarg=$2
!       shift
!       shift
!       continue;;
! 
!     -T) no_target_directory=true
!       shift
!       continue;;
  
      --version) echo "$0 $scriptversion"; exit 0;;
  
      *)  # When -d is used, all remaining arguments are directories to create.
!       # When -t is used, the destination is already specified.
!       test -n "$dir_arg$dstarg" && break
          # Otherwise, the last argument is the destination.  Remove it from 
address@hidden
        for arg
        do
***************
*** 174,186 ****
      src=
  
      if test -d "$dst"; then
!       instcmd=:
        chmodcmd=
      else
!       instcmd=$mkdirprog
      fi
    else
!     # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
      # might cause directories to be created, which would be especially bad
      # if $src (and thus $dsttmp) contains '*'.
      if test ! -f "$src" && test ! -d "$src"; then
--- 176,188 ----
      src=
  
      if test -d "$dst"; then
!       mkdircmd=:
        chmodcmd=
      else
!       mkdircmd=$mkdirprog
      fi
    else
!     # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
      # might cause directories to be created, which would be especially bad
      # if $src (and thus $dsttmp) contains '*'.
      if test ! -f "$src" && test ! -d "$src"; then
***************
*** 202,207 ****
--- 204,213 ----
      # If destination is a directory, append the input filename; won't work
      # if double slashes aren't ignored.
      if test -d "$dst"; then
+       if test -n "$no_target_directory"; then
+       echo "$0: $dstarg: Is a directory" >&2
+       exit 1
+       fi
        dst=$dst/`basename "$src"`
      fi
    fi
***************
*** 229,262 ****
        pathcomp=$pathcomp$1
        shift
        if test ! -d "$pathcomp"; then
!         $mkdirprog "$pathcomp" || lasterr=$?
        # mkdir can fail with a `File exist' error in case several
        # install-sh are creating the directory concurrently.  This
        # is OK.
!       test ! -d "$pathcomp" && { (exit ${lasterr-1}); exit; }
        fi
        pathcomp=$pathcomp/
      done
    fi
  
    if test -n "$dir_arg"; then
!     $doit $instcmd "$dst" \
        && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
        && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
        && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
        && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
  
    else
!     # If we're going to rename the final executable, determine the name now.
!     if test -z "$transformarg"; then
!       dstfile=`basename "$dst"`
!     else
!       dstfile=`basename "$dst" $transformbasename \
!                | sed $transformarg`$transformbasename
!     fi
! 
!     # don't allow the sed command to completely eliminate the filename.
!     test -z "$dstfile" && dstfile=`basename "$dst"`
  
      # Make a couple of temp file names in the proper directory.
      dsttmp=$dstdir/_inst.$$_
--- 235,259 ----
        pathcomp=$pathcomp$1
        shift
        if test ! -d "$pathcomp"; then
!         $mkdirprog "$pathcomp"
        # mkdir can fail with a `File exist' error in case several
        # install-sh are creating the directory concurrently.  This
        # is OK.
!       test -d "$pathcomp" || exit
        fi
        pathcomp=$pathcomp/
      done
    fi
  
    if test -n "$dir_arg"; then
!     $doit $mkdircmd "$dst" \
        && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
        && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
        && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
        && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
  
    else
!     dstfile=`basename "$dst"`
  
      # Make a couple of temp file names in the proper directory.
      dsttmp=$dstdir/_inst.$$_
***************
*** 266,279 ****
      trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
      trap '(exit $?); exit' 1 2 13 15
  
!     # Move or copy the file name to the temp name
!     $doit $instcmd "$src" "$dsttmp" &&
  
      # and set any options; do chmod last to preserve setuid bits.
      #
      # If any of these fail, we abort the whole thing.  If we want to
      # ignore errors from any of these, just make sure not to ignore
!     # errors from the above "$doit $instcmd $src $dsttmp" command.
      #
      { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
        && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
--- 263,276 ----
      trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
      trap '(exit $?); exit' 1 2 13 15
  
!     # Copy the file name to the temp name.
!     $doit $cpprog "$src" "$dsttmp" &&
  
      # and set any options; do chmod last to preserve setuid bits.
      #
      # If any of these fail, we abort the whole thing.  If we want to
      # ignore errors from any of these, just make sure not to ignore
!     # errors from the above "$doit $cpprog $src $dsttmp" command.
      #
      { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
        && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
P install-sh