From b85666e8797e2d5820689400fa698f3f9f15f441 Mon Sep 17 00:00:00 2001 From: Bill Fumerola Date: Tue, 8 Feb 2000 22:31:53 +0000 Subject: [PATCH] Allow $PAGER to have arguments. Submitted by: brian Reviewed by: Doug Barton Approved by: jkh --- usr.sbin/mergemaster/mergemaster.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 330db745f5b..ace6d6c4a90 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" -- 2.45.2