*** doexpire.orig Wed Feb 26 17:16:57 1997 --- expire/doexpire Mon Jul 28 13:53:59 1997 *************** *** 7,12 **** --- 7,14 ---- PATH=$NEWSCTL/bin:$NEWSBIN/expire:$NEWSBIN/nov:$NEWSBIN:$NEWSPATH; export PATH umask $NEWSUMASK + EXPLIST=$NEWSCTL/explist + dor='?' opts= aux=yes *************** *** 23,30 **** histdir=$2 shift ;; -*) opts="$opts $1" ;; ! *) break ;; esac shift done --- 25,37 ---- histdir=$2 shift ;; + -n) opts="$opts $1 $2" ; shift ;; -*) opts="$opts $1" ;; ! '') break ;; ! *) if [ -r $1 ] ! then EXPLIST=$1 ; shift ; break ! else echo "$0: unknown argument \`$1'" >&2 ; exit 2 ! fi ;; esac shift done *************** *** 93,99 **** yes) aux=no ;; esac ! expire $opts $NEWSCTL/explist 2>/tmp/doex$$ # don't run auxiliaries if this is a panic expire case "$aux" in --- 100,106 ---- yes) aux=no ;; esac ! expire $opts $EXPLIST 2>/tmp/doex$$ # don't run auxiliaries if this is a panic expire case "$aux" in