Author: eadler
Date: Thu Dec 20 00:26:46 2012
New Revision: 244454
URL: http://svnweb.freebsd.org/changeset/base/244454
Log:
MFC r243892:
Remove pointless check for the existence of /usr/bin/less which exists
in all configurations.
Approved by: cperciva (implicit)
Modified:
stable/9/usr.sbin/mergemaster/mergemaster.sh
Directory Properties:
stable/9/usr.sbin/ (props changed)
stable/9/usr.sbin/mergemaster/ (props changed)
Modified: stable/9/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- stable/9/usr.sbin/mergemaster/mergemaster.sh Thu Dec 20 00:06:24
2012 (r244453)
+++ stable/9/usr.sbin/mergemaster/mergemaster.sh Thu Dec 20 00:26:46
2012 (r244454)
@@ -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
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "[email protected]"
