[Midnightbsd-cvs] src [8519] trunk/usr.sbin/mergemaster/mergemaster.sh: allow pager choice if it cant find default

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Sep 18 18:59:31 EDT 2016


Revision: 8519
          http://svnweb.midnightbsd.org/src/?rev=8519
Author:   laffer1
Date:     2016-09-18 18:59:30 -0400 (Sun, 18 Sep 2016)
Log Message:
-----------
allow pager choice if it cant find default

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:59:05 UTC (rev 8518)
+++ trunk/usr.sbin/mergemaster/mergemaster.sh	2016-09-18 22:59:30 UTC (rev 8519)
@@ -427,6 +427,8 @@
     echo "  Use 'l' to set PAGER to 'less' for this run"
     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'] "
@@ -442,6 +444,9 @@
     [mM]|'')
        PAGER=more
        ;;
+    /*)
+       PAGER="$FIXPAGER"
+       ;;
     *)
        echo ''
        echo "invalid choice: ${FIXPAGER}"



More information about the Midnightbsd-cvs mailing list