texinfo install-sh,1.5,1.6

[karl]

Update of /cvsroot/texinfo/texinfo
In directory sheep:/tmp/cvs-serv13780

Modified Files:
        install-sh 
Log Message:
autoupdate

Index: install-sh
===================================================================
RCS file: /cvsroot/texinfo/texinfo/install-sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** install-sh  17 Feb 2004 00:48:48 -0000      1.5
--- install-sh  2 Apr 2004 13:02:55 -0000       1.6
***************
*** 2,6 ****
  # install - install a program, script, or datafile
  
! scriptversion=2004-02-15.20
  
  # This originates from X11R5 (mit/util/scripts/install.sh), which was
--- 2,6 ----
  # install - install a program, script, or datafile
  
! scriptversion=2004-04-01.17
  
  # This originates from X11R5 (mit/util/scripts/install.sh), which was
***************
*** 281,304 ****
        && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
  
-     # Now remove or move aside any old file at destination location.  We
-     # try this two ways since rm can't unlink itself on some systems and
-     # the destination file might be busy for other reasons.  In this case,
-     # the final cleanup might fail but the new file should still install
-     # successfully.
-     {
-       if test -f "$dstdir/$dstfile"; then
-         $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-         || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
-         || {
-         echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-         (exit 1); exit
-         }
-       else
-         :
-       fi
-     } &&
- 
      # Now rename the file to the real destination.
!     $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
    fi || { (exit 1); exit; }
  done
--- 281,313 ----
        && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
  
      # Now rename the file to the real destination.
!     { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
!       || {
!          # The rename failed, perhaps because mv can't rename something else
!          # to itself, or perhaps because mv is so ancient that it does not
!          # support -f.
! 
!          # Now remove or move aside any old file at destination location.
!          # We try this two ways since rm can't unlink itself on some
!          # systems and the destination file might be busy for other
!          # reasons.  In this case, the final cleanup might fail but the new
!          # file should still install successfully.
!          {
!            if test -f "$dstdir/$dstfile"; then
!              $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
!              || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
!              || {
!                echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
!                (exit 1); exit
!              }
!            else
!              :
!            fi
!          } &&
! 
!          # Now rename the file to the real destination.
!          $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
!        }
!     }
    fi || { (exit 1); exit; }
  done