rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update install-sh and mkinstalldirs from master source (Automake). They 

have included a few fixes over the years to make them more robust and
faster.
This commit is contained in:
Peter Eisentraut 2003-11-04 10:59:58 +00:00
parent d28bacd897
commit 661a0d64e6
2 changed files with 282 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

357
config/install-sh
View File

@ -1,9 +1,11 @@
#! /bin/sh #!/bin/sh
#
# install - install a program, script, or datafile # install - install a program, script, or datafile
# This comes from X11R5 (mit/util/scripts/install.sh). # This originally came from X11R5 (mit/util/scripts/install.sh).
#
scriptversion=2003-01-17.15
# Copyright 1991 by the Massachusetts Institute of Technology # Copyright 1991 by the Massachusetts Institute of Technology
# (FSF changes in the public domain.)
# #
# Permission to use, copy, modify, distribute, and sell this software and its # Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that # documentation for any purpose is hereby granted without fee, provided that
@ -23,13 +25,11 @@
# from scratch. It can only install one file at a time, a restriction # from scratch. It can only install one file at a time, a restriction
# shared with many OS's install programs. # shared with many OS's install programs.
# 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. # Don't use :- since 4.3BSD and earlier shells don't like it.
doit="${DOITPROG-}" doit="${DOITPROG-}"
# put in absolute paths if you don't have them in your path; or use env. vars. # put in absolute paths if you don't have them in your path; or use env. vars.
mvprog="${MVPROG-mv}" mvprog="${MVPROG-mv}"
@ -41,210 +41,229 @@ stripprog="${STRIPPROG-strip}"
rmprog="${RMPROG-rm}" rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}" mkdirprog="${MKDIRPROG-mkdir}"
transformbasename="" transformbasename=
transform_arg="" transform_arg=
instcmd="$mvprog" instcmd="$mvprog"
chmodcmd="$chmodprog 0755" chmodcmd="$chmodprog 0755"
chowncmd="" chowncmd=
chgrpcmd="" chgrpcmd=
stripcmd="" stripcmd=
rmcmd="$rmprog -f" rmcmd="$rmprog -f"
mvcmd="$mvprog" mvcmd="$mvprog"
src="" src=
dst="" dst=
dir_arg="" dir_arg=
while [ x"$1" != x ]; do usage="Usage: $0 [OPTION]... SRCFILE DSTFILE
case $1 in or: $0 -d DIR1 DIR2...
-c) instcmd="$cpprog"
shift
continue;;
-d) dir_arg=true In the first form, install SRCFILE to DSTFILE, removing SRCFILE by default.
shift In the second, create the directory path DIR.
continue;;
-m) chmodcmd="$chmodprog $2" Options:
shift -b=TRANSFORMBASENAME
shift -c copy source (using $cpprog) instead of moving (using $mvprog).
continue;; -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.
-o) chowncmd="$chownprog $2" Environment variables override the default commands:
shift CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
shift "
continue;;
-g) chgrpcmd="$chgrpprog $2" while test -n "$1"; do
shift case $1 in
shift -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
continue;; shift
continue;;
-s) stripcmd="$stripprog" -c) instcmd=$cpprog
shift shift
continue;; continue;;
-t=*) transformarg=`echo $1 | sed 's/-t=//'` -d) dir_arg=true
shift shift
continue;; continue;;
-b=*) transformbasename=`echo $1 | sed 's/-b=//'` -g) chgrpcmd="$chgrpprog $2"
shift shift
continue;; shift
continue;;
*) if [ x"$src" = x ] --help) echo "$usage"; exit 0;;
then
src=$1 -m) chmodcmd="$chmodprog $2"
else shift
# this colon is to work around a 386BSD /bin/sh bug shift
: continue;;
dst=$1
fi -o) chowncmd="$chownprog $2"
shift shift
continue;; shift
esac continue;;
-s) stripcmd=$stripprog
shift
continue;;
-t=*) transformarg=`echo $1 | sed 's/-t=//'`
shift
continue;;
--version) echo "$0 $scriptversion"; exit 0;;
*) if test -z "$src"; then
src=$1
else
# this colon is to work around a 386BSD /bin/sh bug
:
dst=$1
fi
shift
continue;;
esac
done done
if [ x"$src" = x ] if test -z "$src"; then
then echo "$0: no input file specified." >&2
echo "install: no input file specified" exit 1
exit 1
else
true
fi fi
if [ x"$dir_arg" != x ]; then if test -n "$dir_arg"; then
dst=$src dst=$src
src="" src=
if [ -d $dst ]; then if test -d "$dst"; then
instcmd=: instcmd=:
else chmodcmd=
instcmd=mkdir else
fi instcmd=$mkdirprog
fi
else 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
echo "$0: $src does not exist." >&2
exit 1
fi
# Waiting for this to be detected by the "$instcmd $src $dsttmp" command if test -z "$dst"; then
# might cause directories to be created, which would be especially bad echo "$0: no destination specified." >&2
# if $src (and thus $dsttmp) contains '*'. exit 1
fi
if [ -f $src -o -d $src ] # If destination is a directory, append the input filename; won't work
then # if double slashes aren't ignored.
true if test -d "$dst"; then
else dst=$dst/`basename "$src"`
echo "install: $src does not exist" fi
exit 1
fi
if [ x"$dst" = x ]
then
echo "install: no destination specified"
exit 1
else
true
fi
# If destination is a directory, append the input filename; if your system
# does not like double slashes in filenames, you may need to add some logic
if [ -d $dst ]
then
dst="$dst"/`basename $src`
else
true
fi
fi fi
## this sed command emulates the dirname command ## this sed command emulates the dirname command
dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
# Make sure that the destination directory exists. # Make sure that the destination directory exists.
# this part is taken from Noah Friedman's mkinstalldirs script # (this part is taken from Noah Friedman's mkinstalldirs script.)
# Skip lots of stat calls in the usual case. # Skip lots of stat calls in the usual case.
if [ ! -d "$dstdir" ]; then if test ! -d "$dstdir"; then
defaultIFS=' defaultIFS='
' '
IFS="${IFS-${defaultIFS}}" IFS="${IFS-$defaultIFS}"
oIFS="${IFS}" oIFS=$IFS
# Some sh's can't handle IFS=/ for some reason. # Some sh's can't handle IFS=/ for some reason.
IFS='%' IFS='%'
set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
IFS="${oIFS}" IFS=$oIFS
pathcomp='' pathcomp=
while [ $# -ne 0 ] ; do while test $# -ne 0 ; do
pathcomp="${pathcomp}${1}" pathcomp=$pathcomp$1
shift shift
test -d "$pathcomp" || $mkdirprog "$pathcomp"
if [ ! -d "${pathcomp}" ] ; pathcomp=$pathcomp/
then done
$mkdirprog "${pathcomp}"
else
true
fi
pathcomp="${pathcomp}/"
done
fi fi
if [ x"$dir_arg" != x ] if test -n "$dir_arg"; then
then $doit $instcmd "$dst" \
$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"; }
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
else 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
# If we're going to rename the final executable, determine the name now. # don't allow the sed command to completely eliminate the filename.
test -z "$dstfile" && dstfile=`basename "$dst"`
if [ x"$transformarg" = x ] # Make a couple of temp file names in the proper directory.
then dsttmp=$dstdir/#inst.$$#
dstfile=`basename $dst` rmtmp=$dstdir/#rm.$$#
else
dstfile=`basename $dst $transformbasename |
sed $transformarg`$transformbasename
fi
# don't allow the sed command to completely eliminate the filename # Trap to clean up those temp files at exit.
trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
trap '(exit $?); exit' 1 2 13 15
if [ x"$dstfile" = x ] # Move or copy the file name to the temp name
then $doit $instcmd "$src" "$dsttmp" &&
dstfile=`basename $dst`
else
true
fi
# Make a temp file name in the proper directory. # 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"; } \
&& { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
&& { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
dsttmp=$dstdir/#inst.$$# # 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
# Move or copy the file name to the temp name # the destination file might be busy for other reasons. In this case,
# the final cleanup might fail but the new file should still install
$doit $instcmd $src $dsttmp && # successfully.
{
trap "rm -f ${dsttmp}" 0 && if test -f "$dstdir/$dstfile"; then
$doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
# and set any options; do chmod last to preserve setuid bits || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
|| {
# If any of these fail, we abort the whole thing. If we want to echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
# ignore errors from any of these, just make sure not to ignore (exit 1); exit
# errors from the above "$doit $instcmd $src $dsttmp" command. }
else
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && :
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && fi
if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && } &&
if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
# Now rename the file to the real destination.
$doit $rmcmd -f $dstdir/$dstfile &&
$doit $mvcmd $dsttmp $dstdir/$dstfile
# Now rename the file to the real destination.
$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
fi && fi &&
# The final little trick to "correctly" pass the exit status to the exit trap.
{
(exit 0); exit
}
exit 0 # Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-end: "$"
# End:

113
config/mkinstalldirs
View File

@ -2,35 +2,110 @@
# mkinstalldirs --- make directory hierarchy # mkinstalldirs --- make directory hierarchy
# Author: Noah Friedman <friedman@prep.ai.mit.edu> # Author: Noah Friedman <friedman@prep.ai.mit.edu>
# Created: 1993-05-16 # Created: 1993-05-16
# Last modified: 1994-03-25
# Public domain # Public domain
errstatus=0 errstatus=0
dirmode=""
for file in ${1+"$@"} ; do usage="\
set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
shift
pathcomp= # process command line arguments
for d in ${1+"$@"} ; do while test $# -gt 0 ; do
pathcomp="$pathcomp$d" case $1 in
case "$pathcomp" in -h | --help | --h*) # -h for help
-* ) pathcomp=./$pathcomp ;; echo "$usage" 1>&2
esac exit 0
;;
-m) # -m PERM arg
shift
test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
dirmode=$1
shift
;;
--) # stop option processing
shift
break
;;
-*) # unknown option
echo "$usage" 1>&2
exit 1
;;
*) # first non-opt arg
break
;;
esac
done
if test ! -d "$pathcomp"; then for file
echo "mkdir $pathcomp" 1>&2 do
mkdir "$pathcomp" > /dev/null 2>&1 || lasterr=$? if test -d "$file"; then
fi shift
else
break
fi
done
if test ! -d "$pathcomp"; then case $# in
errstatus=$lasterr 0) exit 0 ;;
fi esac
pathcomp="$pathcomp/" case $dirmode in
done '')
if mkdir -p -- . 2>/dev/null; then
echo "mkdir -p -- $*"
exec mkdir -p -- "$@"
fi
;;
*)
if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
echo "mkdir -m $dirmode -p -- $*"
exec mkdir -m "$dirmode" -p -- "$@"
fi
;;
esac
for file
do
set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
shift
pathcomp=
for d
do
pathcomp="$pathcomp$d"
case $pathcomp in
-*) pathcomp=./$pathcomp ;;
esac
if test ! -d "$pathcomp"; then
echo "mkdir $pathcomp"
mkdir "$pathcomp" || lasterr=$?
if test ! -d "$pathcomp"; then
errstatus=$lasterr
else
if test ! -z "$dirmode"; then
echo "chmod $dirmode $pathcomp"
lasterr=""
chmod "$dirmode" "$pathcomp" || lasterr=$?
if test ! -z "$lasterr"; then
errstatus=$lasterr
fi
fi
fi
fi
pathcomp="$pathcomp/"
done
done done
exit $errstatus exit $errstatus
# Local Variables:
# mode: shell-script
# sh-indentation: 2
# End:
# mkinstalldirs ends here # mkinstalldirs ends here