|
Lines 11-16
Link Here
|
| 11 |
# $FreeBSD$ |
11 |
# $FreeBSD$ |
| 12 |
|
12 |
|
| 13 |
PATH=/bin:/usr/bin:/usr/sbin |
13 |
PATH=/bin:/usr/bin:/usr/sbin |
|
|
14 |
DIFF_TMP=/var/tmp/tmp.mergemaster`date +%m%d.%H.%M.%S` |
| 14 |
|
15 |
|
| 15 |
display_usage () { |
16 |
display_usage () { |
| 16 |
VERSION_NUMBER=`grep "[$]FreeBSD:" $0 | cut -d ' ' -f 4` |
17 |
VERSION_NUMBER=`grep "[$]FreeBSD:" $0 | cut -d ' ' -f 4` |
|
Lines 139-144
diff_loop () {
Link Here
|
| 139 |
esac |
140 |
esac |
| 140 |
fi |
141 |
fi |
| 141 |
if [ "${HANDLE_COMPFILE}" = "v" -o "${HANDLE_COMPFILE}" = "V" ]; then |
142 |
if [ "${HANDLE_COMPFILE}" = "v" -o "${HANDLE_COMPFILE}" = "V" ]; then |
|
|
143 |
diff -I'^.*\$FreeBSD\(: [^$]*\)\?\$.*$' ${DIFF_FLAG} ${DIFF_OPTIONS} "${DESTDIR}${COMPFILE#.}" "${COMPFILE}" > ${DIFF_TMP} |
| 144 |
if [ ! -s ${DIFF_TMP} ] ; then |
| 145 |
# Only differences are $FreeBSD[: *]$ lines. Install. |
| 146 |
rm ${DIFF_TMP} |
| 147 |
echo '' |
| 148 |
echo " *** ${COMPFILE} has not been user modified." |
| 149 |
echo '' |
| 150 |
|
| 151 |
if mm_install "${COMPFILE}"; then |
| 152 |
echo " *** ${COMPFILE} upgraded successfully" |
| 153 |
echo '' |
| 154 |
# Make the list print one file per line |
| 155 |
AUTO_UPGRADED_FILES="${AUTO_UPGRADED_FILES} ${DESTDIR}${COMPFILE#.} |
| 156 |
" |
| 157 |
else |
| 158 |
echo " *** Problem upgrading ${COMPFILE}, it will remain to merge by hand" |
| 159 |
fi |
| 160 |
return |
| 161 |
fi |
| 162 |
rm ${DIFF_TMP} |
| 142 |
echo '' |
163 |
echo '' |
| 143 |
echo ' ====================================================================== ' |
164 |
echo ' ====================================================================== ' |
| 144 |
echo '' |
165 |
echo '' |