summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authoreadler <eadler@FreeBSD.org>2012-12-05 13:56:32 +0000
committereadler <eadler@FreeBSD.org>2012-12-05 13:56:32 +0000
commitfe79744b9c9b93178b0fb17b6dc9bba1d78c463d (patch)
tree12de0cd4074fa564c3dcb232a1e5f468b82cf9a7 /usr.sbin
parent57a7313b0388b3aa20538015568166dfe8c3d72e (diff)
downloadFreeBSD-src-fe79744b9c9b93178b0fb17b6dc9bba1d78c463d.zip
FreeBSD-src-fe79744b9c9b93178b0fb17b6dc9bba1d78c463d.tar.gz
Add ability to mergemaster to permit the user to type
the absolute path to PAGER if mergemaster can not find the one already set. Reviewed by: mjg Approved by: cperciva MFC after: 2 weeks
Diffstat (limited to 'usr.sbin')
-rwxr-xr-xusr.sbin/mergemaster/mergemaster.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index 1723fee..27d48ee 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -426,6 +426,8 @@ check_pager () {
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"
+ echo ''
echo " Default is to use plain old 'more' "
echo ''
echo -n "What should I do? [Use 'more'] "
@@ -451,6 +453,9 @@ check_pager () {
[mM]|'')
PAGER=more
;;
+ /*)
+ PAGER="$FIXPAGER"
+ ;;
*)
echo ''
echo "invalid choice: ${FIXPAGER}"
OpenPOWER on IntegriCloud