Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 30 Jul 2000 23:47:03 +0400 (MSD)
From:      "Dmitry S. Sivachenko" <dima@Chg.RU>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   bin/20305: /usr/sbin/mergermaster has incorrect path for `less'
Message-ID:  <200007301947.XAA76906@chg.ru>

next in thread | raw e-mail | index | archive | help

>Number:         20305
>Category:       bin
>Synopsis:       /usr/sbin/mergermaster has incorrect path for `less'
>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:   Sun Jul 30 12:50:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     Dmitry S. Sivachenko
>Release:        FreeBSD 3.3-RELEASE i386
>Organization:
>Environment:

	
FreeBSD-4.1-STABLE

>Description:

Since 'less' is in the base system now, I have no port of 'less' installed.
But mergemaster has hardcoded path for it.
It should be changed to /usr/bin/less in 4-STABLE and 5-CURRENT.
(i.e. for those systems, that have less in the base distribution).
	

>How-To-Repeat:

	

>Fix:
	
	

--- mergemaster.orig	Sun Jul 30 23:34:19 2000
+++ mergemaster	Sun Jul 30 23:35:03 2000
@@ -114,8 +114,8 @@
     echo "     PAGER and EDITOR. Meanwhile, what would you like to do?"
     echo ''
     echo "  Use 'e' to exit mergemaster and fix your PAGER variable"
-    if [ -x /usr/local/bin/less ]; then
-    echo "  Use 'l' to set PAGER to /usr/local/bin/less for this run"
+    if [ -x /usr/bin/less ]; then
+    echo "  Use 'l' to set PAGER to /usr/bin/less for this run"
     fi
     echo "  Use 'm' to use plain old 'more' as your PAGER for this run"
     echo ''
@@ -127,7 +127,7 @@
        exit 0
        ;;
     [lL]*)
-       PAGER=/usr/local/bin/less
+       PAGER=/usr/bin/less
        ;;
     *)
        PAGER=more

>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?200007301947.XAA76906>