d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add ability to mergemaster to permit the user to type

Browse Source 
the absolute path to PAGER if mergemaster can not find
the one already set.

Reviewed by:	mjg
Approved by:	cperciva
MFC after:	2 weeks
This commit is contained in:
Eitan Adler 2012-12-05 13:56:32 +00:00
parent dc5e7eb62e
commit c7b686bbb7
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=243891
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
usr.sbin/mergemaster/mergemaster.sh
View File

@ -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}"