[Python-checkins] CVS: python/dist/src install-sh,2.3,2.3.4.1
Moshe Zadka
moshez@users.sourceforge.net
2001年3月31日 06:06:34 -0800
Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv21496
Modified Files:
Tag: release20-maint
install-sh
Log Message:
- Update install-sh using version from automake 1.4.
Index: install-sh
===================================================================
RCS file: /cvsroot/python/python/dist/src/install-sh,v
retrieving revision 2.3
retrieving revision 2.3.4.1
diff -C2 -r2.3 -r2.3.4.1
*** install-sh 1998年08月13日 16:08:45 2.3
--- install-sh 2001年03月31日 14:06:32 2.3.4.1
***************
*** 1,13 ****
#!/bin/sh
-
#
# install - install a program, script, or datafile
! # This comes from X11R5; it is not part of GNU.
#
! # $XConsortium: install.sh,v 1.2 89/12/18 14:47:22 jim Exp $
#
! # This script is compatible with the BSD install script, but was written
! # from scratch.
#
--- 1,26 ----
#!/bin/sh
#
# install - install a program, script, or datafile
! # This comes from X11R5 (mit/util/scripts/install.sh).
#
! # Copyright 1991 by the Massachusetts Institute of Technology
#
! # Permission to use, copy, modify, distribute, and sell this software and its
! # 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
+ # shared with many OS's install programs.
***************
*** 27,33 ****
stripprog="${STRIPPROG-strip}"
rmprog="${RMPROG-rm}"
instcmd="$mvprog"
! chmodcmd=""
chowncmd=""
chgrpcmd=""
--- 40,49 ----
stripprog="${STRIPPROG-strip}"
rmprog="${RMPROG-rm}"
+ mkdirprog="${MKDIRPROG-mkdir}"
+ transformbasename=""
+ transform_arg=""
instcmd="$mvprog"
! chmodcmd="$chmodprog 0755"
chowncmd=""
chgrpcmd=""
***************
*** 37,40 ****
--- 53,57 ----
src=""
dst=""
+ dir_arg=""
while [ x"1ドル" != x ]; do
***************
*** 44,47 ****
--- 61,68 ----
continue;;
+ -d) dir_arg=true
+ shift
+ continue;;
+
-m) chmodcmd="$chmodprog 2ドル"
shift
***************
*** 63,70 ****
--- 84,101 ----
continue;;
+ -t=*) transformarg=`echo 1ドル | sed 's/-t=//'`
+ shift
+ continue;;
+
+ -b=*) transformbasename=`echo 1ドル | sed 's/-b=//'`
+ shift
+ continue;;
+
*) if [ x"$src" = x ]
then
src=1ドル
else
+ # this colon is to work around a 386BSD /bin/sh bug
+ :
dst=1ドル
fi
***************
*** 76,119 ****
if [ x"$src" = x ]
then
! echo "install: no input file specified"
exit 1
fi
! if [ x"$dst" = x ]
! then
! echo "install: no destination specified"
! exit 1
! 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`
fi
# Make a temp file name in the proper directory.
! # Avoid dirname, which doesn't exist everywhere...
! dstdir=`echo $dst | sed 's,/[^/]*,,ドル'`
! dsttmp=$dstdir/#inst.$$#
# Move or copy the file name to the temp name
! $doit $instcmd $src $dsttmp || exit $?
# and set any options; do chmod last to preserve setuid bits
! if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; fi
! if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; fi
! if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; fi
! if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; fi
# Now rename the file to the real destination.
! $doit $rmcmd $dst
! $doit $mvcmd $dsttmp $dst || exit $?
--- 107,250 ----
if [ x"$src" = x ]
then
! echo "install: no input file specified"
exit 1
+ else
+ true
fi
! if [ x"$dir_arg" != x ]; then
! dst=$src
! src=""
!
! if [ -d $dst ]; then
! instcmd=:
! chmodcmd=""
! else
! instcmd=mkdir
! fi
! 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 ]
! then
! true
! else
! echo "install: $src does not exist"
! 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
!
! ## this sed command emulates the dirname command
! 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
! true
! fi
!
! pathcomp="${pathcomp}/"
! done
fi
+ if [ x"$dir_arg" != x ]
+ then
+ $doit $instcmd $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
+
+ # 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
+ true
+ fi
+
# Make a temp file name in the proper directory.
! dsttmp=$dstdir/#inst.$$#
# Move or copy the file name to the temp name
+
+ $doit $instcmd $src $dsttmp &&
! trap "rm -f ${dsttmp}" 0 &&
# 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.
!
! if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
! if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;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
! fi &&