#!/bin/sh
# This is a shell archive (produced by GNU shar 4.0).
# To extract the files from this archive, save it to some FILE, remove
# everything before the `!/bin/sh' line above, then type `sh FILE'.
#
# Made on 1995-02-18 11:32 EST by <dcs@proton>.
# Source directory was `/u/dcs/ws'.
#
# Existing files will *not* be overwritten unless `-c' is specified.
#
# This shar contains:
# length mode       name
# ------ ---------- ------------------------------------------
#    955 -rwxr-xr-x checkNO/checkNO
#   1466 -rw-r--r-- checkNO/README
#
touch -am 1231235999 $$.touch >/dev/null 2>&1
if test ! -f 1231235999 && test -f $$.touch; then
  shar_touch=touch
else
  shar_touch=:
  echo 'WARNING: not restoring timestamps'
fi
rm -f 1231235999 $$.touch
#
# ============= checkNO/checkNO ==============
if test ! -d 'checkNO'; then
  echo 'x - creating directory checkNO'
  mkdir 'checkNO'
fi
if test -f 'checkNO/checkNO' && test X"$1" != X"-c"; then
  echo 'x - skipping checkNO/checkNO (File already exists)'
else
  echo 'x - extracting checkNO/checkNO (text)'
  sed 's/^X//' << 'SHAR_EOF' > 'checkNO/checkNO' &&
#!/bin/ksh
typeset tmpfile=/tmp/files.NO
typeset dirs=.
X
function resolve
{
X    echo "e: vi $1 $2\nr: rm $1\nm: mv $1 $2 ? \c"
X    read a
X    case $a in
X	[eE]*) set -x; vi $1 $2; set +x	;;
X	[rR]*) set -x; rm $1;    set +x	;;
X	[mM]*) set -x; mv $1 $2; set +x	;;
X    esac
}
X
function older
{
X    diff -c $1 $2
X    resolve $1 $2
}
X
function newer
{
X    diff -c $2 $1
X    resolve $1 $2
}
X
if [ "x$1" = "x-d" ]; then
X    dirs="$2"
X    shift 2
fi
X
if [ "x$1" = "x-x" ]; then
X    shift 1
X
else
X    find $dirs -local -name '*.[ON]' -print > $tmpfile
X
fi
X
for f in $(cat $tmpfile)
do
X    case $f in
X	*.O)
X	    if [ -f $f ]; then
X		older $f ${f%.O}
X
X	    elif [ -d $f ]; then
X		for df in $(find $f -type f -print)
X		do
X		    older $f/$df ${f%.O}/$df
X		done
X	    fi
X    	    ;;
X
X	*.N)
X	    if [ -f $f ]; then
X		newer $f ${f%.N}
X
X	    elif [ -d $f ]; then
X		for df in $(find $f -type f -print)
X		do
X		    newer $f/$df ${f%.N}/$df
X		done
X	    fi
X	    ;;
X    esac
done
SHAR_EOF
  $shar_touch -am 0218113095 'checkNO/checkNO' &&
  chmod 0755 'checkNO/checkNO' ||
  echo 'restore of checkNO/checkNO failed'
  shar_count="`wc -c < 'checkNO/checkNO'`"
  test 955 -eq "$shar_count" ||
    echo "checkNO/checkNO: original size 955, current size $shar_count"
fi
# ============= checkNO/README ==============
if test -f 'checkNO/README' && test X"$1" != X"-c"; then
  echo 'x - skipping checkNO/README (File already exists)'
else
  echo 'x - extracting checkNO/README (text)'
  sed 's/^X//' << 'SHAR_EOF' > 'checkNO/README' &&
XFrom: travis@harbor.esd.sgi.com (Mike Travis)
Newsgroups: comp.sys.sgi.misc
Subject: Re: Irix 5.2 -> Irix 5.3 Upgrade FAQ?
Date: 18 Feb 1995 07:15:45 GMT
Organization: Silicon Graphics, Inc.  Mountain View, CA
X
Paul Jackson <pj@sam.engr.sgi.com> writes:
|After the installation is finished you should run:
|
|    versions changed
|
|to get a list of the config files that were installed, so that you
|can manually merge changes made locally with changes provided in
|the new version of IRIX.
X
After doing a couple hundred of these updates (we load and test most
all the alphas during development, I've got a little script to help the
"merge" process.  It's a little rustic but it does help to quickly
determine the new vs. old files and how to merge those files, like
/etc/inittab which might have changes you've made.
X
Basically it collects a list of files named *.[NO] and then walks the
list showing the differences and giving you the option to "(r)emove the
alternate file", "(m)ove the alternate replacing the current file", or
"(e)dit the two files" to produce a merged output file.
X
Most times I run this I usually encounter no more than about 10 or
15 changed files and that's only because I reconfigure the kernel
often for many different (test) scenarios.
X
The arg -d <dir> specifies a different directory than "." and the arg
-x skips the "find files" to allow you to continue from an interrupted
session.
X
-- 
Mike Travis
Silicon Graphics
travis@sgi.com
SHAR_EOF
  $shar_touch -am 0218113195 'checkNO/README' &&
  chmod 0644 'checkNO/README' ||
  echo 'restore of checkNO/README failed'
  shar_count="`wc -c < 'checkNO/README'`"
  test 1466 -eq "$shar_count" ||
    echo "checkNO/README: original size 1466, current size $shar_count"
fi
exit 0