Date: Wed, 12 Jul 2000 02:09:26 +0100 (BST) From: brian@Awfulhak.org To: FreeBSD-gnats-submit@freebsd.org Subject: bin/19858: mergemasters interpretation of $PAGER is incorrect [PATCH] Message-ID: <200007120109.CAA29246@hak.lan.Awfulhak.org>
next in thread | raw e-mail | index | archive | help
>Number: 19858
>Category: bin
>Synopsis: mergemasters interpretation of $PAGER is incorrect [PATCH]
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Tue Jul 11 18:20:00 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: Brian Somers
>Release: FreeBSD 5.0-CURRENT i386
>Organization:
Awfulhak Ltd.
>Environment:
Stock -current system
>Description:
Mergemaster treats ``more'' as an exception to it's requirement
that $PAGER specifies a full path name. It also tests if ${PAGER%% *}
is executable which is incorrect when ${PAGER} is not absolute.
>How-To-Repeat:
Run mergemaster with a $PAGER that contains a non-absolute path name.
>Fix:
Index: mergemaster.sh
===================================================================
RCS file: /home/ncvs/src/usr.sbin/mergemaster/mergemaster.sh,v
retrieving revision 1.8
diff -u -r1.8 mergemaster.sh
--- mergemaster.sh 2000/05/12 03:09:57 1.8
+++ mergemaster.sh 2000/06/30 10:04:40
@@ -252,7 +252,7 @@
#
case "${DONT_CHECK_PAGER}" in
'')
- while [ "${PAGER}" != "more" -a -n "${PAGER}" -a ! -x "${PAGER%% *}" ]; do
+ while ! type "${PAGER%% *}" >/dev/null && [ -n "$PAGER" ]; do
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"
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200007120109.CAA29246>