--ELM1112796955-17257-0_
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=US-ASCII

Hi everyone,

enclosed find an extensively rewritten version of install-sh.
It corrects the following issues:

* can create more than one directory (using -d)
* sets ownership and permissions on newly-created subdirectories
* much less susceptible to argument length limitations of sed (probably not
  an issue for GNU sed)

I would like to ask you to review it. Once it is approved I would
like to commit it to pkgsrc/bootstrap. Unfortunately there does not seem
to be a mechanism of updating files like this one on existing installations.

Georg

-- 
Georg Schwarz    http://home.pages.de/~schwarz/
 georg.schwarz@freenet.de  +49 178 8545053

--ELM1112796955-17257-0_
Content-Transfer-Encoding: 7bit
Content-Type: text/plain
Content-Disposition: attachment; filename=install-sh
Content-Description: 

#!/bin/sh
#
# $NetBSD: install-sh.in,v 1.3 2005/03/04 03:11:50 jschauma Exp $
# This script now also installs multiple files, but might choke on installing
# multiple files with spaces in the file names.
#
# 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.

# set DOITPROG to echo to test this script

# Don't use :- since 4.3BSD and earlier shells don't like it.
doit="${DOITPROG-}"


# put in absolute paths if you don't have them in your path; or use env. vars.

mvprog="${MVPROG-mv}"
cpprog="${CPPROG-cp}"
chmodprog="${CHMODPROG-chmod}"
chownprog="${CHOWNPROG-chown}"
chgrpprog="${CHGRPPROG-chgrp}"
stripprog="${STRIPPROG-strip}"
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"

transformbasename=""
transform_arg=""
instcmd="$mvprog"
chmodcmd="$chmodprog 755"
chowncmd=""
chgrpcmd=""
stripcmd=""
stripflags=""
rmcmd="$rmprog -f"
mvcmd="$mvprog"
src=""
msrc=""
dst=""
dir_arg=""

while [ x"$1" != x ]; do
    case $1 in
	-c) instcmd="$cpprog"
	    shift
	    continue;;

	-d) dir_arg=true
	    shift
	    continue;;

	-m) chmodcmd="$chmodprog $2"
	    shift
	    shift
	    continue;;

	-o) chowncmd="$chownprog $2"
	    shift
	    shift
	    continue;;

	-g) chgrpcmd="$chgrpprog $2"
	    shift
	    shift
	    continue;;

	-s) stripcmd="$stripprog"
	    shift
	    continue;;

	-S) stripcmd="$stripprog"
	    stripflags="-S $2 $stripflags"
	    shift
	    shift
	    continue;;

	-t=*) transformarg=`echo "$1" | sed 's/-t=//'`
	    shift
	    continue;;

	-b=*) transformbasename=`echo "$1" | sed 's/-b=//'`
	    shift
	    continue;;

	*)  if [ x"$msrc" = x ]
	    then
		msrc="$dst"
	    else
		msrc="$msrc $dst"
	    fi
	    src="$dst"
	    dst="$1"
	    shift
	    continue;;
    esac
done

if [ x"$dir_arg" = x ]
then
	dstisfile=""
	if [ ! -d "$dst" ]
	then
		if [ x"$msrc" = x"$src" ]
		then
			dstisfile=true
		else
			echo "install: destination is not a directory"
			exit 1
		fi
	fi
else
	msrc="$msrc $dst"
fi

if [ x"$msrc" = x ]
then
	echo "install: no destination specified"
	exit 1
fi      

for srcarg in $msrc; do

if [ x"$dir_arg" != x ]; then

	dstarg="$srcarg"
else
	dstarg="$dst"

# Waiting for this to be detected by the "$instcmd $srcarg $dsttmp" command
# might cause directories to be created, which would be especially bad 
# if $src (and thus $dsttmp) contains '*'.

	if [ -f "$srcarg" ]
	then
		doinst="$instcmd"
	elif [ -d "$srcarg" ]
	then
		echo "install: $srcarg: not a regular file"
		exit 1
	elif [ "$srcarg" = "/dev/null" ]
	then
		doinst="$cpprog"
	else
		echo "install:  $srcarg does not exist"
		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 "$dstarg" ]
	then
		dstarg="$dstarg"/`basename "$srcarg"`
	fi
fi

## this sed command emulates the dirname command
dstdir=`echo "$dstarg" | 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
		$doit $mkdirprog "${pathcomp}"
        	if [ x"$chowncmd" != x ]; then $doit $chowncmd "${pathcomp}"; else true ; fi &&
        	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "${pathcomp}"; else true ; fi &&
        	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "${pathcomp}"; else true ; fi

	else
		true
	fi

	pathcomp="${pathcomp}/"
done
fi

	if [ x"$dir_arg" != x ]
	then
		if [ -d "$dstarg" ]; then
			true
		else
			$doit $mkdirprog "$dstarg" &&

			if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dstarg"; else true ; fi &&
			if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dstarg"; else true ; fi &&
			if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dstarg"; else true ; fi
		fi
	else

# If we're going to rename the final file, determine the name now.

		if [ x"$dstisfile" = x ]
		then
			file=$srcarg
		else
			file=$dst
		fi

		if [ x"$transformarg" = x ] 
		then
			dstfile=`basename "$file"`
		else
			dstfile=`basename "$file" "$transformbasename" | 
				sed $transformarg`$transformbasename
		fi

# don't allow the sed command to completely eliminate the filename

		if [ x"$dstfile" = x ] 
		then
			dstfile=`basename "$file"`
		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 $doinst $srcarg "$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 $stripflags "$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

done &&


exit 0

--ELM1112796955-17257-0_--