diff options
| author | billf <billf@FreeBSD.org> | 2000-02-08 22:31:53 +0000 |
|---|---|---|
| committer | billf <billf@FreeBSD.org> | 2000-02-08 22:31:53 +0000 |
| commit | f5630daedc3091daac3c6112b8866a41d9253bd0 (patch) | |
| tree | 52c9e9c5d1cab595b0b105d740b10290baa3f0b7 /usr.sbin/mergemaster | |
| parent | 6b5dfacc052d3b56fe236cf30f56bc9d5982f283 (diff) | |
| download | FreeBSD-src-f5630daedc3091daac3c6112b8866a41d9253bd0.zip FreeBSD-src-f5630daedc3091daac3c6112b8866a41d9253bd0.tar.gz | |
Allow $PAGER to have arguments.
Submitted by: brian
Reviewed by: Doug Barton <Doug@gorean.org>
Approved by: jkh
Diffstat (limited to 'usr.sbin/mergemaster')
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 330db74..ace6d6c 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -107,7 +107,7 @@ echo '' # case "${DONT_CHECK_PAGER}" in '') - if [ -n "${PAGER}" -a ! -x "${PAGER}" ]; then + if [ -n "${PAGER}" -a ! -x "${PAGER%% *}" ]; then echo " *** Your PAGER environment variable specifies '${PAGER}', but" echo " I cannot execute it. In general it is good practice to" echo " specify the full path for environment variables like" |
