X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Ffiles%2Flesser.sh;h=16eb3176bd70af0ccc1066faf011f38f80a0700c;hb=8ed08d7d44f80edb3067d1880593491f14692f18;hp=66b7732ef2bd5e4529c3a38db77c2cd618db15b8;hpb=f3056aa14dd7d652b75ca3d7ba8c401f5db1e22c;p=feisty_meow.git diff --git a/scripts/files/lesser.sh b/scripts/files/lesser.sh index 66b7732e..16eb3176 100644 --- a/scripts/files/lesser.sh +++ b/scripts/files/lesser.sh @@ -2,19 +2,23 @@ # runs the less command but with some additional options. # -# we always pass the raw flag (-r) so our special formatting is not lost. -# this may not be the best choice for some text terminals. -# -# there is also a "code" option added (-c) that formats the incoming data as -# if it were source code before showing the output. this works great on files -# that are actually recognized as source code, and not so great on other -# things like simple lists or error output. +# there is a "code" option (-c) that formats the incoming data as if it were source code before +# displaying the output. this works great on files that are actually recognized as source code, +# and not so great on other things like simple lists or error output. function lesser() { local code_view_flag="$1" + + EXTRA_OPTIONS= + if [ "$code_view_flag" == "-c" ]; then # saw the 'code' flag, which means show the file with source highlighting. shift + + # we always pass the raw flag (-r) when in code view mode so special formatting is not lost. + # this may not work for some text terminals. + EXTRA_OPTIONS=-r + else # drop the value and emptiness will mean don't show code. unset code_view_flag @@ -25,9 +29,8 @@ function lesser() export LESSOPEN="| source-highlight -f esc -o STDOUT -i %s" fi - # run the source highlighter first if needed. - /bin/less -r "${@}" + /usr/bin/env less $EXTRA_OPTIONS "${@}" } ##############