[Emacs-diffs] Changes to emacs/install-sh

[Miles Bader]

Index: emacs/install-sh
diff -c emacs/install-sh:1.1 emacs/install-sh:1.2
*** emacs/install-sh:1.1        Mon Oct 11 05:45:52 1999
--- emacs/install-sh    Tue Feb  4 09:56:31 2003
***************
*** 115,121 ****
  if [ x"$dir_arg" != x ]; then
        dst=$src
        src=""
!       
        if [ -d $dst ]; then
                instcmd=:
        else
--- 115,121 ----
  if [ x"$dir_arg" != x ]; then
        dst=$src
        src=""
! 
        if [ -d $dst ]; then
                instcmd=:
        else
***************
*** 124,130 ****
  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 [ -f $src -o -d $src ]
--- 124,130 ----
  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 [ -f $src -o -d $src ]
***************
*** 134,140 ****
                echo "install:  $src does not exist"
                exit 1
        fi
!       
        if [ x"$dst" = x ]
        then
                echo "install:  no destination specified"
--- 134,140 ----
                echo "install:  $src does not exist"
                exit 1
        fi
! 
        if [ x"$dst" = x ]
        then
                echo "install:  no destination specified"
***************
*** 162,168 ****
  
  # Skip lots of stat calls in the usual case.
  if [ ! -d "$dstdir" ]; then
! defaultIFS='  
  '
  IFS="${IFS-${defaultIFS}}"
  
--- 162,168 ----
  
  # Skip lots of stat calls in the usual case.
  if [ ! -d "$dstdir" ]; then
! defaultIFS='
  '
  IFS="${IFS-${defaultIFS}}"
  
***************
*** 201,217 ****
  
  # If we're going to rename the final executable, determine the name now.
  
!       if [ x"$transformarg" = x ] 
        then
                dstfile=`basename $dst`
        else
!               dstfile=`basename $dst $transformbasename | 
                        sed $transformarg`$transformbasename
        fi
  
  # don't allow the sed command to completely eliminate the filename
  
!       if [ x"$dstfile" = x ] 
        then
                dstfile=`basename $dst`
        else
--- 201,217 ----
  
  # If we're going to rename the final executable, determine the name now.
  
!       if [ x"$transformarg" = x ]
        then
                dstfile=`basename $dst`
        else
!               dstfile=`basename $dst $transformbasename |
                        sed $transformarg`$transformbasename
        fi
  
  # don't allow the sed command to completely eliminate the filename
  
!       if [ x"$dstfile" = x ]
        then
                dstfile=`basename $dst`
        else
***************
*** 242,248 ****
  # Now rename the file to the real destination.
  
        $doit $rmcmd -f $dstdir/$dstfile &&
!       $doit $mvcmd $dsttmp $dstdir/$dstfile 
  
  fi &&
  
--- 242,248 ----
  # Now rename the file to the real destination.
  
        $doit $rmcmd -f $dstdir/$dstfile &&
!       $doit $mvcmd $dsttmp $dstdir/$dstfile
  
  fi &&