|
Lines 31-36
Link Here
|
| 31 |
echo " -u N Specify a numeric umask" |
31 |
echo " -u N Specify a numeric umask" |
| 32 |
echo " -w N Specify a screen width in columns to sdiff" |
32 |
echo " -w N Specify a screen width in columns to sdiff" |
| 33 |
echo ' -D /path/directory Specify the destination directory to install files to' |
33 |
echo ' -D /path/directory Specify the destination directory to install files to' |
|
|
34 |
echo ' -V do not view diffs by default' |
| 34 |
echo '' |
35 |
echo '' |
| 35 |
} |
36 |
} |
| 36 |
|
37 |
|
|
Lines 103-109
Link Here
|
| 103 |
# options |
104 |
# options |
| 104 |
diff_loop () { |
105 |
diff_loop () { |
| 105 |
|
106 |
|
| 106 |
HANDLE_COMPFILE=v |
107 |
HANDLE_COMPFILE=${VIEW_DIFF} |
| 107 |
|
108 |
|
| 108 |
while [ "${HANDLE_COMPFILE}" = "v" -o "${HANDLE_COMPFILE}" = "V" -o "${HANDLE_COMPFILE}" = "NOT V" ]; do |
109 |
while [ "${HANDLE_COMPFILE}" = "v" -o "${HANDLE_COMPFILE}" = "V" -o "${HANDLE_COMPFILE}" = "NOT V" ]; do |
| 109 |
if [ -f "${DESTDIR}${COMPFILE#.}" -a -f "${COMPFILE}" ]; then |
110 |
if [ -f "${DESTDIR}${COMPFILE#.}" -a -f "${COMPFILE}" ]; then |
|
Lines 225-231
Link Here
|
| 225 |
|
226 |
|
| 226 |
# Check the command line options |
227 |
# Check the command line options |
| 227 |
# |
228 |
# |
| 228 |
while getopts ":ascrvhim:t:du:w:D:" COMMAND_LINE_ARGUMENT ; do |
229 |
while getopts ":ascrvhim:t:du:w:D:V" COMMAND_LINE_ARGUMENT ; do |
| 229 |
case "${COMMAND_LINE_ARGUMENT}" in |
230 |
case "${COMMAND_LINE_ARGUMENT}" in |
| 230 |
s) |
231 |
s) |
| 231 |
STRICT=yes |
232 |
STRICT=yes |
|
Lines 271-276
Link Here
|
| 271 |
D) |
272 |
D) |
| 272 |
DESTDIR=${OPTARG} |
273 |
DESTDIR=${OPTARG} |
| 273 |
;; |
274 |
;; |
|
|
275 |
V) |
| 276 |
VIEW_DIFF="NOT V" |
| 277 |
;; |
| 274 |
*) |
278 |
*) |
| 275 |
display_usage |
279 |
display_usage |
| 276 |
exit 1 |
280 |
exit 1 |
|
Lines 343-348
Link Here
|
| 343 |
# Assign the diff flag once so we will not have to keep testing it |
347 |
# Assign the diff flag once so we will not have to keep testing it |
| 344 |
# |
348 |
# |
| 345 |
DIFF_FLAG=${DIFF_FLAG:--u} |
349 |
DIFF_FLAG=${DIFF_FLAG:--u} |
|
|
350 |
|
| 351 |
# Assign the choice to view diff so we will not have to keep testing it |
| 352 |
# |
| 353 |
VIEW_DIFF=${VIEW_DIFF:-v} |
| 346 |
|
354 |
|
| 347 |
# Assign the source directory |
355 |
# Assign the source directory |
| 348 |
# |
356 |
# |