===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sudo/Attic/install-sh,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -c -r1.3 -r1.3.4.1
*** src/usr.bin/sudo/Attic/install-sh	2000/06/09 16:25:59	1.3
--- src/usr.bin/sudo/Attic/install-sh	2002/01/18 17:20:23	1.3.4.1
***************
*** 1,7 ****
  #! /bin/sh
  
  ## (From INN-1.4, written by Rich Salz)
! ##  $Revision: 1.3 $
  ##  A script to install files and directories.
  
  PROGNAME=`basename $0`
--- 1,7 ----
  #! /bin/sh
  
  ## (From INN-1.4, written by Rich Salz)
! ##  $Revision: 1.3.4.1 $
  ##  A script to install files and directories.
  
  PROGNAME=`basename $0`
***************
*** 16,51 ****
  MV=mv
  RM=rm
  STRIP=strip
! WHOAMI=whoami
  
  ##  Some systems don't support -x, so we have to use -f.
! if [ ${CHOWN} = chown ] ; then
!     if [ -f /sbin/chown ] ; then
! 	CHOWN=/sbin/chown
!     elif [ -f /etc/chown ] ; then
! 	CHOWN=/etc/chown
!     elif [ -f /usr/sbin/chown ] ; then
! 	CHOWN=/usr/sbin/chown
!     elif [ -f /usr/etc/chown ] ; then
! 	CHOWN=/usr/etc/chown
      fi
! fi
  
! if [ ${WHOAMI} = whoami ] ; then
!     if [ -f /usr/ucb/whoami ] ; then
! 	WHOAMI=/usr/ucb/whoami
!     elif [ -f /usr/bin/whoami ] ; then
! 	WHOAMI=/usr/bin/whoami
      fi
! fi
  
! if [ ${STRIP} = strip ] ; then
!     if [ -f /usr/ccs/bin/strip ] ; then
! 	STRIP=/usr/ccs/bin/strip
!     elif [ -f /usr/bin/strip ] ; then
! 	STRIP=/usr/bin/strip
      fi
! fi
  
  ##  Defaults.
  CHOWNIT=false
--- 16,46 ----
  MV=mv
  RM=rm
  STRIP=strip
! WHOAMI="echo root"
  
  ##  Some systems don't support -x, so we have to use -f.
! for d in /sbin /etc /usr/sbin /usr/etc; do
!     if [ -f $d/chown ]; then
! 	CHOWN=${d}/chown
! 	break
      fi
! done
  
! for d in /usr/bin /bin /usr/ucb /usr/bsd; do
!     if [ -f $d/whoami ]; then
! 	WHOAMI=${d}/whoami
! 	break
!     elif [ -f $d/id ]; then
! 	WHOAMI=${d}/id | sed -n 's/^[^(]*(\([^)]*\)).*/\1/p'
      fi
! done
  
! for d in /usr/ccs/bin /usr/bin /bin; do
!     if [ -f $d/strip ]; then
! 	STRIP=${d}/strip
! 	break
      fi
! done
  
  ##  Defaults.
  CHOWNIT=false
***************
*** 55,62 ****
  BACKIT=false
  TOUCHIT=true
  SAVESRC=false
- ROOT=unknown
  
  ##  Process JCL.
  MORETODO=true
  while ${MORETODO} ; do
--- 50,65 ----
  BACKIT=false
  TOUCHIT=true
  SAVESRC=false
  
+ case `${WHOAMI}` in
+ root)
+     ROOT=true
+     ;;
+ *)
+     ROOT=false
+     ;;
+ esac
+ 
  ##  Process JCL.
  MORETODO=true
  while ${MORETODO} ; do
***************
*** 83,117 ****
  	CHGROUPIT=true
  	;;
      X-G)
- 	case ${ROOT} in
- 	unknown)
- 	    case `${WHOAMI}` in
- 	    root)
- 		ROOT=true
- 		;;
- 	    *)
- 		ROOT=false
- 		;;
- 	    esac
- 	    ;;
- 	esac
  	GROUP="$2"
  	shift
  	${ROOT} && CHGROUPIT=true
  	;;
      X-G*)
- 	case ${ROOT} in
- 	unknown)
- 	    case `${WHOAMI}` in
- 	    root)
- 		ROOT=true
- 		;;
- 	    *)
- 		ROOT=false
- 		;;
- 	    esac
- 	    ;;
- 	esac
  	if ${ROOT} ; then
  	    GROUP=`expr "$1" : '-g\(.*\)'`
  	    CHGROUPIT=true
--- 86,96 ----
***************
*** 126,131 ****
--- 105,119 ----
  	MODE=`expr "$1" : '-m\(.*\)'`
  	CHMODIT=true
  	;;
+     X-M)
+ 	MODE="$2"
+ 	${ROOT} && CHMODIT=true
+ 	shift
+ 	;;
+     X-M*)
+ 	MODE=`expr "$1" : '-m\(.*\)'`
+ 	${ROOT} && CHMODIT=true
+ 	;;
      X-n)
  	TOUCHIT=false
  	;;
***************
*** 139,173 ****
  	CHOWNIT=true
  	;;
      X-O)
- 	case ${ROOT} in
- 	unknown)
- 	    case `${WHOAMI}` in
- 	    root)
- 		ROOT=true
- 		;;
- 	    *)
- 		ROOT=false
- 		;;
- 	    esac
- 	    ;;
- 	esac
  	OWNER="$2"
  	shift
  	${ROOT} && CHOWNIT=true
  	;;
      X-O*)
- 	case ${ROOT} in
- 	unknown)
- 	    case `${WHOAMI}` in
- 	    root)
- 		ROOT=true
- 		;;
- 	    *)
- 		ROOT=false
- 		;;
- 	    esac
- 	    ;;
- 	esac
  	if ${ROOT} ; then
  	    OWNER=`expr "$1" : '-o\(.*\)'`
  	    CHOWNIT=true
--- 127,137 ----