update install-sh to the automake-1.11 version

b4a66196 · Peter Foley · 141a659f · b4a66196
Kaydet (Commit) b4a66196 authored Şub 26, 2012 tarafından Peter Foley
Show whitespace changes
Inline Side-by-side

Showing with 456 additions and 205 deletions

install-sh install-sh +456 -205

No files found.
--- a/install-sh
+++ b/install-sh
 #!/bin/sh
-#
 # install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
+scriptversion=2011-01-19.21; # UTC
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
 #
-# Copyright 1991 by the Massachusetts Institute of Technology
 #
-# Permission to use, copy, modify, distribute, and sell this software and its
+# FSF changes to this file are in the public domain.
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
 # `make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
+# from scratch.
-# shared with many OS's install programs.
+nl='
+'
+IFS=" ""	$nl"
 # 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"; then
+  doit_exec=exec
-# put in absolute paths if you don't have them in your path; or use env. vars.
+else
+  doit_exec=$doit
-mvprog="${MVPROG-mv}"
+fi
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
+# Put in absolute file names if you don't have them in your path;
-chownprog="${CHOWNPROG-chown}"
+# or use environment vars.
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
+chgrpprog=${CHGRPPROG-chgrp}
-rmprog="${RMPROG-rm}"
+chmodprog=${CHMODPROG-chmod}
-mkdirprog="${MKDIRPROG-mkdir}"
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
-transformbasename=""
+cpprog=${CPPROG-cp}
-transform_arg=""
+mkdirprog=${MKDIRPROG-mkdir}
-instcmd="$mvprog"
+mvprog=${MVPROG-mv}
-chmodcmd="$chmodprog 0755"
+rmprog=${RMPROG-rm}
-chowncmd=""
+stripprog=${STRIPPROG-strip}
-chgrpcmd=""
-stripcmd=""
+posix_glob='?'
-rmcmd="$rmprog -f"
+initialize_posix_glob='
-mvcmd="$mvprog"
+  test "$posix_glob" != "?" || {
-src=""
+    if (set -f) 2>/dev/null; then
-dst=""
+      posix_glob=
-dir_arg=""
+    else
+      posix_glob=:
+    fi
+  }
+'
-while [ x"$1" != x ]; do
+posix_mkdir=
+# Desired mode of installed file.
+mode=0755
+chgrpcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
+rmcmd="$rmprog -f"
+stripcmd=
+src=
+dst=
+dir_arg=
+dst_arg=
+copy_on_change=false
+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:
+     --help     display this help and exit.
+     --version  display version info and exit.
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -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.
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
+"
+while test $# -ne 0; do
  case $1 in
-	-c) instcmd=$cpprog
+    -c) ;;
-	    shift
-	    continue;;
-	-d) dir_arg=true
+    -C) copy_on_change=true;;
-	    shift
-	    continue;;
-	-m) chmodcmd="$chmodprog $2"
+    -d) dir_arg=true;;
-	    shift
-	    shift
+    -g) chgrpcmd="$chgrpprog $2"
-	    continue;;
+	shift;;
+    --help) echo "$usage"; exit $?;;
+    -m) mode=$2
+	case $mode in
+	  *' '* | *'	'* | *'
+'*	  | *'*'* | *'?'* | *'['*)
+	    echo "$0: invalid mode: $mode" >&2
+	    exit 1;;
+	esac
+	shift;;
    -o) chowncmd="$chownprog $2"
-	    shift
+	shift;;
-	    shift
-	    continue;;
-	-g) chgrpcmd="$chgrpprog $2"
+    -s) stripcmd=$stripprog;;
-	    shift
-	    shift
-	    continue;;
-	-s) stripcmd=$stripprog
+    -t) dst_arg=$2
-	    shift
+	# Protect names problematic for `test' and other utilities.
-	    continue;;
+	case $dst_arg in
+	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
+	esac
+	shift;;
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
+    -T) no_target_directory=true;;
-	    shift
-	    continue;;
+    --version) echo "$0 $scriptversion"; exit $?;;
+    --)	shift
+	break;;
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+    -*)	echo "$0: invalid option: $1" >&2
+	exit 1;;
+    *)  break;;
+  esac
  shift
-	    continue;;
+done
-	*)  if [ x"$src" = x ]
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
-	    then
+  # When -d is used, all remaining arguments are directories to create.
-		src=$1
+  # When -t is used, the destination is already specified.
-	    else
+  # Otherwise, the last argument is the destination.  Remove it from $@.
-		# this colon is to work around a 386BSD /bin/sh bug
+  for arg
-		:
+  do
-		dst=$1
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
    fi
-	    shift
+    shift # arg
-	    continue;;
+    dst_arg=$arg
+    # Protect names problematic for `test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
    esac
-done
+  done
+fi
-if [ x"$src" = x ]
+if test $# -eq 0; then
-then
+  if test -z "$dir_arg"; then
-	echo "$0: no input file specified" >&2
+    echo "$0: no input file specified." >&2
    exit 1
-else
+  fi
-	:
+  # It's OK to call `install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
 fi
-if [ x"$dir_arg" != x ]; then
+if test -z "$dir_arg"; then
-	dst=$src
+  do_exit='(exit $ret); exit $ret'
-	src=""
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
-	if [ -d "$dst" ]; then
+  trap "ret=141; $do_exit" 13
-		instcmd=:
+  trap "ret=143; $do_exit" 15
-		chmodcmd=""
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+    *[0-7])
+      if test -z "$stripcmd"; then
+	u_plus_rw=
      else
-		instcmd=$mkdirprog
+	u_plus_rw='% 200'
      fi
-else
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+for src
-# might cause directories to be created, which would be especially bad
+do
-# if $src (and thus $dsttmp) contains '*'.
+  # Protect names problematic for `test' and other utilities.
+  case $src in
+    -* | [=\(\)!]) src=./$src;;
+  esac
-	if [ -f "$src" ] || [ -d "$src" ]
+  if test -n "$dir_arg"; then
-	then
+    dst=$src
-		:
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
  else
-		echo "$0: $src does not exist" >&2
+    # 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
+      echo "$0: $src does not exist." >&2
      exit 1
    fi
-	if [ x"$dst" = x ]
+    if test -z "$dst_arg"; then
-	then
+      echo "$0: no destination specified." >&2
-		echo "$0: no destination specified" >&2
      exit 1
-	else
-		:
    fi
+    dst=$dst_arg
-# If destination is a directory, append the input filename; if your system
+    # If destination is a directory, append the input filename; won't work
-# does not like double slashes in filenames, you may need to add some logic
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
-	if [ -d "$dst" ]
+      if test -n "$no_target_directory"; then
-	then
+	echo "$0: $dst_arg: Is a directory" >&2
-		dst=$dst/`basename "$src"`
+	exit 1
-	else
-		:
      fi
-fi
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
-## this sed command emulates the dirname command
+      dstdir_status=0
-dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='
-	'
-IFS="${IFS-$defaultIFS}"
-oIFS=$IFS
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS=$oIFS
-pathcomp=''
-while [ $# -ne 0 ] ; do
-	pathcomp=$pathcomp$1
-	shift
-	if [ ! -d "$pathcomp" ] ;
-        then
-		$mkdirprog "$pathcomp"
    else
-		:
+      # Prefer dirname, but fall back on a substitute if dirname fails.
-	fi
+      dstdir=`
+	(dirname "$dst") 2>/dev/null ||
-	pathcomp=$pathcomp/
+	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-done
+	     X"$dst" : 'X\(//\)[^/]' \| \
-fi
+	     X"$dst" : 'X\(//\)$' \| \
+	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-if [ x"$dir_arg" != x ]
+	echo X"$dst" |
-then
+	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	$doit $instcmd "$dst" &&
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)[^/].*/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\).*/{
+		   s//\1/
+		   q
+		 }
+		 s/.*/./; q'
+      `
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
+      test -d "$dstdir"
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
+      dstdir_status=$?
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
+    fi
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
+  fi
-else
-# If we're going to rename the final executable, determine the name now.
+  obsolete_mkdir_used=false
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+	# Create intermediate dirs using mode 755 as modified by the umask.
+	# This is like FreeBSD 'install' as of 1997-10-28.
+	umask=`umask`
+	case $stripcmd.$umask in
+	  # Optimize common cases.
+	  *[2367][2367]) mkdir_umask=$umask;;
+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+	  *[0-7])
+	    mkdir_umask=`expr $umask + 22 \
+	      - $umask % 100 % 40 + $umask % 20 \
+	      - $umask % 10 % 4 + $umask % 2
+	    `;;
+	  *) mkdir_umask=$umask,go-w;;
+	esac
-	if [ x"$transformarg" = x ]
+	# With -d, create the new directory with the user-specified mode.
-	then
+	# Otherwise, rely on $mkdir_umask.
-		dstfile=`basename "$dst"`
+	if test -n "$dir_arg"; then
+	  mkdir_mode=-m$mode
 	else
-		dstfile=`basename "$dst" $transformbasename |
+	  mkdir_mode=
-			sed $transformarg`$transformbasename
 	fi
-# don't allow the sed command to completely eliminate the filename
+	posix_mkdir=false
+	case $umask in
-	if [ x"$dstfile" = x ]
+	  *[123567][0-7][0-7])
+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+	    ;;
+	  *)
+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+	    if (umask $mkdir_umask &&
+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
 	    then
-		dstfile=`basename "$dst"`
+	      if test -z "$dir_arg" || {
+		   # Check for POSIX incompatibilities with -m.
+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+		   # other-writeable bit of parent directory when it shouldn't.
+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+		   case $ls_ld_tmpdir in
+		     d????-?r-*) different_mode=700;;
+		     d????-?--*) different_mode=755;;
+		     *) false;;
+		   esac &&
+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+		   }
+		 }
+	      then posix_mkdir=:
+	      fi
+	      rmdir "$tmpdir/d" "$tmpdir"
 	    else
-		:
+	      # Remove any dirs left behind by ancient mkdir implementations.
+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
 	    fi
+	    trap '' 0;;
+	esac;;
+    esac
-# Make a couple of temp file names in the proper directory.
+    if
+      $posix_mkdir && (
-	dsttmp=$dstdir/#inst.$$#
+	umask $mkdir_umask &&
-	rmtmp=$dstdir/#rm.$$#
+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
-# Trap to clean up temp files at exit.
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
-	trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
+      case $dstdir in
-	trap '(exit $?); exit' 1 2 13 15
+	/*) prefix='/';;
+	[-=\(\)!]*) prefix='./';;
+	*)  prefix='';;
+      esac
-# Move or copy the file name to the temp name
+      eval "$initialize_posix_glob"
-	$doit $instcmd "$src" "$dsttmp" &&
+      oIFS=$IFS
+      IFS=/
+      $posix_glob set -f
+      set fnord $dstdir
+      shift
+      $posix_glob set +f
+      IFS=$oIFS
-# and set any options; do chmod last to preserve setuid bits
+      prefixes=
-# If any of these fail, we abort the whole thing.  If we want to
+      for d
-# ignore errors from any of these, just make sure not to ignore
+      do
-# errors from the above "$doit $instcmd $src $dsttmp" command.
+	test X"$d" = X && continue
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
+	prefix=$prefix$d
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
+	if test -d "$prefix"; then
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
+	  prefixes=
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
+	else
+	  if $posix_mkdir; then
+	    (umask=$mkdir_umask &&
+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+	    # Don't fail if two instances are running concurrently.
+	    test -d "$prefix" || exit 1
+	  else
+	    case $prefix in
+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+	      *) qprefix=$prefix;;
+	    esac
+	    prefixes="$prefixes '$qprefix'"
+	  fi
+	fi
+	prefix=$prefix/
+      done
+      if test -n "$prefixes"; then
+	# Don't fail if two instances are running concurrently.
+	(umask $mkdir_umask &&
+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
+	  test -d "$dstdir" || exit 1
+	obsolete_mkdir_used=true
+      fi
+    fi
+  fi
-# Now remove or move aside any old file at destination location.  We try this
+  if test -n "$dir_arg"; then
-# two ways since rm can't unlink itself on some systems and the destination
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-# file might be busy for other reasons.  In this case, the final cleanup
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-# might fail but the new file should still install successfully.
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+  else
-{
+    # Make a couple of temp file names in the proper directory.
-	if [ -f "$dstdir/$dstfile" ]
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+    # Copy the file name to the temp name.
+    (umask $cp_umask && $doit_exec $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"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
+       eval "$initialize_posix_glob" &&
+       $posix_glob set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       $posix_glob set +f &&
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
    then
-		$doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
+      rm -f "$dsttmp"
-		$doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
-		{
-		  echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-		  (exit 1); exit
-		}
    else
-		:
+      # Rename the file to the real destination.
-	fi
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-} &&
-# Now rename the file to the real destination.
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
-	$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+      # 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.
+	{
+	  test ! -f "$dst" ||
+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+	  } ||
+	  { echo "$0: cannot unlink or rename $dst" >&2
+	    (exit 1); exit 1
+	  }
+	} &&
-fi &&
+	# Now rename the file to the real destination.
+	$doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
-# The final little trick to "correctly" pass the exit status to the exit trap.
+    trap '' 0
+  fi
+done
-{
+# Local variables:
-	(exit 0); exit
+# eval: (add-hook 'write-file-hooks 'time-stamp)
-}
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End: