diff options
author | eadler <eadler@FreeBSD.org> | 2012-12-05 13:56:36 +0000 |
---|---|---|
committer | eadler <eadler@FreeBSD.org> | 2012-12-05 13:56:36 +0000 |
commit | e955c7ba8bdbada4af6f9b5f789baac802844ebf (patch) | |
tree | 41c839a0a523557725c349eab26001827c0a7531 | |
parent | fe79744b9c9b93178b0fb17b6dc9bba1d78c463d (diff) | |
download | FreeBSD-src-e955c7ba8bdbada4af6f9b5f789baac802844ebf.zip FreeBSD-src-e955c7ba8bdbada4af6f9b5f789baac802844ebf.tar.gz |
Remove pointless check for the existence of /usr/bin/less which exists
in all configurations.
Reviewed by: mjg
Approved by: cperciva
MFC after: 2 weeks
-rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 27d48ee..48b58f3 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -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 " or you may type an absolute path to PAGER for this run" @@ -438,17 +436,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 |