Use less(1) options to negate the need for a useless and lame shell func.

	* etc/pkgusr/bash_profile (LESS): Add 'F' and 'X' which will allow
	getting rid of that silly less-or-cat() shell function.

	* etc/pkgusr/handy_funcs (less-or-cat): Removed.
	Update all functions/aliases to use less instead of less-or-cat.
	(showinst,showgen,instg): Pipe output through less.

Signed-off-by: Steve Youngs <steve@steveyoungs.com>

diff --git a/etc/pkgusr/bash_profile b/etc/pkgusr/bash_profile
index 67ddfab..bc756dd 100644 (file)
--- a/etc/pkgusr/bash_profile
+++ b/etc/pkgusr/bash_profile
@@ -13,7 +13,7 @@ LC_ALL=POSIX
 PATH=/usr/lib/pkgusr:/usr/bin:/bin:/usr/X11R6/bin:/opt/qt/bin
 
 ## A couple things to make less(1) nicer.
-LESS=-MRgisw
+LESS='-MRgiswFX'
 LESSCHARSET=utf-8
 LESSOPEN='|lesspipe.sh %s'
 

diff --git a/etc/pkgusr/handy_funcs b/etc/pkgusr/handy_funcs
index 7f90d79..d7d447f 100644 (file)
--- a/etc/pkgusr/handy_funcs
+++ b/etc/pkgusr/handy_funcs
@@ -4,19 +4,6 @@
 # What lies here is a collection of handy bash shell functions and
 # aliases that make life a little easier for pkgusr.
 
-less-or-cat()
-{
-    local arg=$1
-    local al=$(wc -l<${arg})
-    local sl=$(($LINES-2))
-
-    if [ $al -le $sl ]; then
-       cat ${arg}
-    else
-       less ${arg}
-    fi
-}
-
 verr()
 {
     local arg=$1
@@ -24,12 +11,12 @@ verr()
        arg=all
     fi
     case $arg in
-       (conf)    less-or-cat ${HOME}/configure.err ;;
-       (install) less-or-cat ${HOME}/install.err ;;
-       (check)   less-or-cat ${HOME}/check.err ;;
-       (make)    less-or-cat ${HOME}/make.err ;;
-       (upd)     less-or-cat ${HOME}/upd.err ;;
-       (ver)     less-or-cat ${HOME}/verupd.err ;;
+       (conf)    less ${HOME}/configure.err ;;
+       (install) less ${HOME}/install.err ;;
+       (check)   less ${HOME}/check.err ;;
+       (make)    less ${HOME}/make.err ;;
+       (upd)     less ${HOME}/upd.err ;;
+       (ver)     less ${HOME}/verupd.err ;;
        (all)     less ${HOME}/*.err ;;
     esac
 }
@@ -41,12 +28,12 @@ vlog()
        arg=all
     fi
     case $arg in
-       (conf)    less-or-cat ${HOME}/configure.log ;;
-       (install) less-or-cat ${HOME}/install.log ;;
-       (check)   less-or-cat ${HOME}/check.log ;;
-       (make)    less-or-cat ${HOME}/make.log ;;
-       (upd)     less-or-cat ${HOME}/upd.log ;;
-       (ver)     less-or-cat ${HOME}/verupd.log ;;
+       (conf)    less ${HOME}/configure.log ;;
+       (install) less ${HOME}/install.log ;;
+       (check)   less ${HOME}/check.log ;;
+       (make)    less ${HOME}/make.log ;;
+       (upd)     less ${HOME}/upd.log ;;
+       (ver)     less ${HOME}/verupd.log ;;
        (all)     less ${HOME}/*.log ;;
     esac
 }
@@ -74,7 +61,7 @@ instg()
     if [ -z "$arg" ]; then
        arg=err
     fi
-    grep --color '^\*\*\*' ${HOME}/install.${arg}
+    grep --colour=always '^\*\*\*' ${HOME}/install.${arg}|less
 }
 
 dlog()
@@ -97,14 +84,14 @@ showinst()
 {
     local top=$(grep -n "^Install Notes:$" ${HOME}/.project|cut -d: -f1)
     local bot=$(grep -n "^General Notes:$" ${HOME}/.project|cut -d: -f1)
-    sed -n ${top},${bot}p ${HOME}/.project
+    sed -n ${top},${bot}p ${HOME}/.project|less
 }
 
 showgen()
 {
     local top=$(grep -n "^General Notes:$" ${HOME}/.project|cut -d: -f1)
     local bot=$(grep -n "^CONTENTS:$" ${HOME}/.project|cut -d: -f1)
-    sed -n ${top},${bot}p ${HOME}/.project
+    sed -n ${top},${bot}p ${HOME}/.project|less
 }
 
 xtar()
@@ -230,7 +217,6 @@ alias deps='grep --colour "Deps: " ${HOME}/.project'
 alias ipkg=showinst
 alias gpkg=showgen
 alias listp='pinky -l $(whoami)|less'
-alias lc=less-or-cat
 
 H-pkg()
 {