[Midnightbsd-cvs] src [8517] trunk/usr.sbin/mergemaster/mergemaster.sh: remove pointless check for less

[laffer1 at midnightbsd.org]

Revision: 8517
          http://svnweb.midnightbsd.org/src/?rev=8517
Author:   laffer1
Date:     2016-09-18 18:58:51 -0400 (Sun, 18 Sep 2016)
Log Message:
-----------
remove pointless check for less

Modified Paths:
--------------
    trunk/usr.sbin/mergemaster/mergemaster.sh

Modified: trunk/usr.sbin/mergemaster/mergemaster.sh
===================================================================
--- trunk/usr.sbin/mergemaster/mergemaster.sh	2016-09-18 22:57:24 UTC (rev 8516)
+++ trunk/usr.sbin/mergemaster/mergemaster.sh	2016-09-18 22:58:51 UTC (rev 8517)
@@ -424,9 +424,7 @@
     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' "
@@ -439,17 +437,7 @@
        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