Attachment 9764 Details for Bug 19858 – mm-5.diff

[patch] mm-5.diff

mm-5.diff (text/plain; charset=us-ascii), 1.79 KB, created by DougB on 2000-07-27 22:13:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: DougB

Created: 2000-07-27 22:13:09 UTC

Size: 1.79 KB

patch

obsolete

>Index: mergemaster.sh
>===================================================================
>RCS file: /usr/ncvs/src/usr.sbin/mergemaster/mergemaster.sh,v
>retrieving revision 1.8
>diff -u -r1.8 mergemaster.sh
>--- mergemaster.sh	2000/05/12 03:09:57	1.8
>+++ mergemaster.sh	2000/07/25 10:16:40
>@@ -252,15 +252,14 @@
> #
> case "${DONT_CHECK_PAGER}" in
> '')
>-  while [ "${PAGER}" != "more" -a -n "${PAGER}" -a ! -x "${PAGER%% *}" ]; do
>+  while ! type "${PAGER%% *}" >/dev/null && [ -n "${PAGER}" ]; do
>     echo " *** Your PAGER environment variable specifies '${PAGER}', but"
>-    echo "     I cannot execute it. In general it is good practice to"
>-    echo "     specify the full path for environment variables like"
>-    echo "     PAGER and EDITOR. Meanwhile, what would you like to do?"
>+    echo "     due to the limited PATH that I use for security reasons,"
>+    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/local/bin/less ]; then
>-    echo "  Use 'l' to set PAGER to /usr/local/bin/less for this run"
>+    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 ''
>@@ -272,8 +271,16 @@
>        exit 0
>        ;;
>     [lL])
>-       if [ -x /usr/local/bin/less ]; then
>+       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
>        ;;
>     [mM]|'')

Actions: View | Diff

Attachments on bug 19858: 9762 | 9763 | 9764