[BACK]Return to install-sh CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / mtr

Diff for /embedaddon/mtr/install-sh between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2016/11/01 09:33:48 version 1.1.1.3, 2016/11/01 09:44:48
Line 1 Line 1
 #!/bin/sh  #!/bin/sh
 # install - install a program, script, or datafile  # install - install a program, script, or datafile
   
scriptversion=2011-11-20.07; # UTCscriptversion=2013-12-25.23; # UTC
   
 # This originates from X11R5 (mit/util/scripts/install.sh), which was  # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the  # later released in X11R6 (xc/config/util/install.sh) with the
Line 41  scriptversion=2011-11-20.07; # UTC Line 41  scriptversion=2011-11-20.07; # UTC
 # This script is compatible with the BSD install script, but was written  # This script is compatible with the BSD install script, but was written
 # from scratch.  # from scratch.
   
   tab='   '
 nl='  nl='
 '  '
IFS=" ""        $nl"IFS=" $tab$nl"
   
# set DOITPROG to echo to test this script# Set DOITPROG to "echo" to test this script.
   
 # Don't use :- since 4.3BSD and earlier shells don't like it.  
 doit=${DOITPROG-}  doit=${DOITPROG-}
if test -z "$doit"; thendoit_exec=${doit:-exec}
  doit_exec=exec 
else 
  doit_exec=$doit 
fi 
   
 # Put in absolute file names if you don't have them in your path;  # Put in absolute file names if you don't have them in your path;
 # or use environment vars.  # or use environment vars.
Line 68  mvprog=${MVPROG-mv} Line 64  mvprog=${MVPROG-mv}
 rmprog=${RMPROG-rm}  rmprog=${RMPROG-rm}
 stripprog=${STRIPPROG-strip}  stripprog=${STRIPPROG-strip}
   
 posix_glob='?'  
 initialize_posix_glob='  
   test "$posix_glob" != "?" || {  
     if (set -f) 2>/dev/null; then  
       posix_glob=  
     else  
       posix_glob=:  
     fi  
   }  
 '  
   
 posix_mkdir=  posix_mkdir=
   
 # Desired mode of installed file.  # Desired mode of installed file.
Line 97  dir_arg= Line 82  dir_arg=
 dst_arg=  dst_arg=
   
 copy_on_change=false  copy_on_change=false
no_target_directory=is_target_a_directory=possibly
   
 usage="\  usage="\
 Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE  Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
Line 137  while test $# -ne 0; do Line 122  while test $# -ne 0; do
     -d) dir_arg=true;;      -d) dir_arg=true;;
   
     -g) chgrpcmd="$chgrpprog $2"      -g) chgrpcmd="$chgrpprog $2"
        shift;;        shift;;
   
     --help) echo "$usage"; exit $?;;      --help) echo "$usage"; exit $?;;
   
     -m) mode=$2      -m) mode=$2
        case $mode in        case $mode in
          *' '* | *'       '* | *'          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
'*        | *'*'* | *'?'* | *'['*)            echo "$0: invalid mode: $mode" >&2
            echo "$0: invalid mode: $mode" >&2            exit 1;;
            exit 1;;        esac
        esac        shift;;
        shift;; 
   
     -o) chowncmd="$chownprog $2"      -o) chowncmd="$chownprog $2"
        shift;;        shift;;
   
     -s) stripcmd=$stripprog;;      -s) stripcmd=$stripprog;;
   
    -t) dst_arg=$2    -t)
        # Protect names problematic for 'test' and other utilities.        is_target_a_directory=always
        case $dst_arg in        dst_arg=$2
          -* | [=\(\)!]) dst_arg=./$dst_arg;;        # Protect names problematic for 'test' and other utilities.
        esac        case $dst_arg in
        shift;;          -* | [=\(\)!]) dst_arg=./$dst_arg;;
         esac
         shift;;
   
    -T) no_target_directory=true;;    -T) is_target_a_directory=never;;
   
     --version) echo "$0 $scriptversion"; exit $?;;      --version) echo "$0 $scriptversion"; exit $?;;
   
    --)        shift    --) shift
        break;;        break;;
   
    -*)        echo "$0: invalid option: $1" >&2    -*) echo "$0: invalid option: $1" >&2
        exit 1;;        exit 1;;
   
     *)  break;;      *)  break;;
   esac    esac
   shift    shift
 done  done
   
   # We allow the use of options -d and -T together, by making -d
   # take the precedence; this is for compatibility with GNU install.
   
   if test -n "$dir_arg"; then
     if test -n "$dst_arg"; then
       echo "$0: target directory not allowed when installing a directory." >&2
       exit 1
     fi
   fi
   
 if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then  if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
   # When -d is used, all remaining arguments are directories to create.    # When -d is used, all remaining arguments are directories to create.
   # When -t is used, the destination is already specified.    # When -t is used, the destination is already specified.
Line 208  if test $# -eq 0; then Line 204  if test $# -eq 0; then
 fi  fi
   
 if test -z "$dir_arg"; then  if test -z "$dir_arg"; then
     if test $# -gt 1 || test "$is_target_a_directory" = always; then
       if test ! -d "$dst_arg"; then
         echo "$0: $dst_arg: Is not a directory." >&2
         exit 1
       fi
     fi
   fi
   
   if test -z "$dir_arg"; then
   do_exit='(exit $ret); exit $ret'    do_exit='(exit $ret); exit $ret'
   trap "ret=129; $do_exit" 1    trap "ret=129; $do_exit" 1
   trap "ret=130; $do_exit" 2    trap "ret=130; $do_exit" 2
Line 223  if test -z "$dir_arg"; then Line 228  if test -z "$dir_arg"; then
   
     *[0-7])      *[0-7])
       if test -z "$stripcmd"; then        if test -z "$stripcmd"; then
        u_plus_rw=        u_plus_rw=
       else        else
        u_plus_rw='% 200'        u_plus_rw='% 200'
       fi        fi
       cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;        cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
     *)      *)
       if test -z "$stripcmd"; then        if test -z "$stripcmd"; then
        u_plus_rw=        u_plus_rw=
       else        else
        u_plus_rw=,u+rw        u_plus_rw=,u+rw
       fi        fi
       cp_umask=$mode$u_plus_rw;;        cp_umask=$mode$u_plus_rw;;
   esac    esac
Line 269  do Line 274  do
     # If destination is a directory, append the input filename; won't work      # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.      # if double slashes aren't ignored.
     if test -d "$dst"; then      if test -d "$dst"; then
      if test -n "$no_target_directory"; then      if test "$is_target_a_directory" = never; then
        echo "$0: $dst_arg: Is a directory" >&2        echo "$0: $dst_arg: Is a directory" >&2
        exit 1        exit 1
       fi        fi
       dstdir=$dst        dstdir=$dst
       dst=$dstdir/`basename "$src"`        dst=$dstdir/`basename "$src"`
       dstdir_status=0        dstdir_status=0
     else      else
      # Prefer dirname, but fall back on a substitute if dirname fails.      dstdir=`dirname "$dst"`
      dstdir=` 
        (dirname "$dst") 2>/dev/null || 
        expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ 
             X"$dst" : 'X\(//\)[^/]' \| \ 
             X"$dst" : 'X\(//\)$' \| \ 
             X"$dst" : 'X\(/\)' \| . 2>/dev/null || 
        echo X"$dst" | 
            sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ 
                   s//\1/ 
                   q 
                 } 
                 /^X\(\/\/\)[^/].*/{ 
                   s//\1/ 
                   q 
                 } 
                 /^X\(\/\/\)$/{ 
                   s//\1/ 
                   q 
                 } 
                 /^X\(\/\).*/{ 
                   s//\1/ 
                   q 
                 } 
                 s/.*/./; q' 
      ` 
 
       test -d "$dstdir"        test -d "$dstdir"
       dstdir_status=$?        dstdir_status=$?
     fi      fi
Line 314  do Line 293  do
   if test $dstdir_status != 0; then    if test $dstdir_status != 0; then
     case $posix_mkdir in      case $posix_mkdir in
       '')        '')
        # Create intermediate dirs using mode 755 as modified by the umask.        # Create intermediate dirs using mode 755 as modified by the umask.
        # This is like FreeBSD 'install' as of 1997-10-28.        # This is like FreeBSD 'install' as of 1997-10-28.
        umask=`umask`        umask=`umask`
        case $stripcmd.$umask in        case $stripcmd.$umask in
          # Optimize common cases.          # Optimize common cases.
          *[2367][2367]) mkdir_umask=$umask;;          *[2367][2367]) mkdir_umask=$umask;;
          .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;          .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
   
          *[0-7])          *[0-7])
            mkdir_umask=`expr $umask + 22 \            mkdir_umask=`expr $umask + 22 \
              - $umask % 100 % 40 + $umask % 20 \              - $umask % 100 % 40 + $umask % 20 \
              - $umask % 10 % 4 + $umask % 2              - $umask % 10 % 4 + $umask % 2
            `;;            `;;
          *) mkdir_umask=$umask,go-w;;          *) mkdir_umask=$umask,go-w;;
        esac        esac
   
        # With -d, create the new directory with the user-specified mode.        # With -d, create the new directory with the user-specified mode.
        # Otherwise, rely on $mkdir_umask.        # Otherwise, rely on $mkdir_umask.
        if test -n "$dir_arg"; then        if test -n "$dir_arg"; then
          mkdir_mode=-m$mode          mkdir_mode=-m$mode
        else        else
          mkdir_mode=          mkdir_mode=
        fi        fi
   
        posix_mkdir=false        posix_mkdir=false
        case $umask in        case $umask in
          *[123567][0-7][0-7])          *[123567][0-7][0-7])
            # POSIX mkdir -p sets u+wx bits regardless of umask, which            # POSIX mkdir -p sets u+wx bits regardless of umask, which
            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
            ;;            ;;
          *)          *)
            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
            trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0            trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
   
            if (umask $mkdir_umask &&            if (umask $mkdir_umask &&
                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
            then            then
              if test -z "$dir_arg" || {              if test -z "$dir_arg" || {
                   # Check for POSIX incompatibilities with -m.                   # Check for POSIX incompatibilities with -m.
                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
                   # other-writable bit of parent directory when it shouldn't.                   # other-writable bit of parent directory when it shouldn't.
                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
                   ls_ld_tmpdir=`ls -ld "$tmpdir"`                   ls_ld_tmpdir=`ls -ld "$tmpdir"`
                   case $ls_ld_tmpdir in                   case $ls_ld_tmpdir in
                     d????-?r-*) different_mode=700;;                     d????-?r-*) different_mode=700;;
                     d????-?--*) different_mode=755;;                     d????-?--*) different_mode=755;;
                     *) false;;                     *) false;;
                   esac &&                   esac &&
                   $mkdirprog -m$different_mode -p -- "$tmpdir" && {                   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
                     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`                     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
                   }                   }
                 }                 }
              then posix_mkdir=:              then posix_mkdir=:
              fi              fi
              rmdir "$tmpdir/d" "$tmpdir"              rmdir "$tmpdir/d" "$tmpdir"
            else            else
              # Remove any dirs left behind by ancient mkdir implementations.              # Remove any dirs left behind by ancient mkdir implementations.
              rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null              rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
            fi            fi
            trap '' 0;;            trap '' 0;;
        esac;;        esac;;
     esac      esac
   
     if      if
       $posix_mkdir && (        $posix_mkdir && (
        umask $mkdir_umask &&        umask $mkdir_umask &&
        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
       )        )
     then :      then :
     else      else
Line 391  do Line 370  do
       # directory the slow way, step by step, checking for races as we go.        # directory the slow way, step by step, checking for races as we go.
   
       case $dstdir in        case $dstdir in
        /*) prefix='/';;        /*) prefix='/';;
        [-=\(\)!]*) prefix='./';;        [-=\(\)!]*) prefix='./';;
        *)  prefix='';;        *)  prefix='';;
       esac        esac
   
       eval "$initialize_posix_glob"  
   
       oIFS=$IFS        oIFS=$IFS
       IFS=/        IFS=/
      $posix_glob set -f      set -f
       set fnord $dstdir        set fnord $dstdir
       shift        shift
      $posix_glob set +f      set +f
       IFS=$oIFS        IFS=$oIFS
   
       prefixes=        prefixes=
   
       for d        for d
       do        do
        test X"$d" = X && continue        test X"$d" = X && continue
   
        prefix=$prefix$d        prefix=$prefix$d
        if test -d "$prefix"; then        if test -d "$prefix"; then
          prefixes=          prefixes=
        else        else
          if $posix_mkdir; then          if $posix_mkdir; then
            (umask=$mkdir_umask &&            (umask=$mkdir_umask &&
             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
            # Don't fail if two instances are running concurrently.            # Don't fail if two instances are running concurrently.
            test -d "$prefix" || exit 1            test -d "$prefix" || exit 1
          else          else
            case $prefix in            case $prefix in
              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
              *) qprefix=$prefix;;              *) qprefix=$prefix;;
            esac            esac
            prefixes="$prefixes '$qprefix'"            prefixes="$prefixes '$qprefix'"
          fi          fi
        fi        fi
        prefix=$prefix/        prefix=$prefix/
       done        done
   
       if test -n "$prefixes"; then        if test -n "$prefixes"; then
        # Don't fail if two instances are running concurrently.        # Don't fail if two instances are running concurrently.
        (umask $mkdir_umask &&        (umask $mkdir_umask &&
         eval "\$doit_exec \$mkdirprog $prefixes") ||         eval "\$doit_exec \$mkdirprog $prefixes") ||
          test -d "$dstdir" || exit 1          test -d "$dstdir" || exit 1
        obsolete_mkdir_used=true        obsolete_mkdir_used=true
       fi        fi
     fi      fi
   fi    fi
Line 472  do Line 449  do
   
     # If -C, don't bother to copy if it wouldn't change the file.      # If -C, don't bother to copy if it wouldn't change the file.
     if $copy_on_change &&      if $copy_on_change &&
       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
       set -f &&
       eval "$initialize_posix_glob" && 
       $posix_glob set -f && 
        set X $old && old=:$2:$4:$5:$6 &&         set X $old && old=:$2:$4:$5:$6 &&
        set X $new && new=:$2:$4:$5:$6 &&         set X $new && new=:$2:$4:$5:$6 &&
       $posix_glob set +f &&       set +f &&
 
        test "$old" = "$new" &&         test "$old" = "$new" &&
        $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1         $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
     then      then
Line 493  do Line 467  do
       # to itself, or perhaps because mv is so ancient that it does not        # to itself, or perhaps because mv is so ancient that it does not
       # support -f.        # support -f.
       {        {
        # Now remove or move aside any old file at destination location.        # Now remove or move aside any old file at destination location.
        # We try this two ways since rm can't unlink itself on some        # We try this two ways since rm can't unlink itself on some
        # systems and the destination file might be busy for other        # systems and the destination file might be busy for other
        # reasons.  In this case, the final cleanup might fail but the new        # reasons.  In this case, the final cleanup might fail but the new
        # file should still install successfully.        # file should still install successfully.
        {        {
          test ! -f "$dst" ||          test ! -f "$dst" ||
          $doit $rmcmd -f "$dst" 2>/dev/null ||          $doit $rmcmd -f "$dst" 2>/dev/null ||
          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
          } ||          } ||
          { echo "$0: cannot unlink or rename $dst" >&2          { echo "$0: cannot unlink or rename $dst" >&2
            (exit 1); exit 1            (exit 1); exit 1
          }          }
        } &&        } &&
   
        # Now rename the file to the real destination.        # Now rename the file to the real destination.
        $doit $mvcmd "$dsttmp" "$dst"        $doit $mvcmd "$dsttmp" "$dst"
       }        }
     fi || exit 1      fi || exit 1
   
Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>