Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 20 Dec 2012 00:26:47 +0000 (UTC)
From:      Eitan Adler <eadler@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject:   svn commit: r244456 - stable/7/usr.sbin/mergemaster
Message-ID:  <201212200026.qBK0Qld5020856@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: eadler
Date: Thu Dec 20 00:26:47 2012
New Revision: 244456
URL: http://svnweb.freebsd.org/changeset/base/244456

Log:
  MFC r243892:
  	Remove pointless check for the existence of /usr/bin/less which exists
  	in all configurations.
  
  Approved by:	cperciva (implicit)

Modified:
  stable/7/usr.sbin/mergemaster/mergemaster.sh
Directory Properties:
  stable/7/usr.sbin/   (props changed)
  stable/7/usr.sbin/mergemaster/   (props changed)

Modified: stable/7/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- stable/7/usr.sbin/mergemaster/mergemaster.sh	Thu Dec 20 00:26:46 2012	(r244455)
+++ stable/7/usr.sbin/mergemaster/mergemaster.sh	Thu Dec 20 00:26:47 2012	(r244456)
@@ -421,9 +421,7 @@ check_pager () {
     echo "     I cannot execute it.  So, what would you like to do?"
     echo ''
     echo "  Use 'e' to exit mergemaster and fix your PAGER variable"
-    if [ -x /usr/bin/less -o -x /usr/local/bin/less ]; then
     echo "  Use 'l' to set PAGER to 'less' for this run"
-    fi
     echo "  Use 'm' to use plain old 'more' as your PAGER for this run"
     echo ''
     echo "  Default is to use plain old 'more' "
@@ -436,17 +434,7 @@ check_pager () {
        exit 0
        ;;
     [lL])
-       if [ -x /usr/bin/less ]; then
-         PAGER=/usr/bin/less
-       elif [ -x /usr/local/bin/less ]; then
-         PAGER=/usr/local/bin/less
-       else
-         echo ''
-         echo " *** Fatal Error:"
-         echo "     You asked to use 'less' as your pager, but I can't"
-         echo "     find it in /usr/bin or /usr/local/bin"
-         exit 1
-       fi
+       PAGER=less
        ;;
     [mM]|'')
        PAGER=more



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212200026.qBK0Qld5020856>