xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the doc command for users of BSD man

Browse Source 
This commit uses options and flags that will work on both the BSD and
the `man-db` implementations, however those changes remain unportable as
the POSIX standard only defines a single `-k` flag for the utility,
which we don't need.

The call to the `col` utility has also been replaced by a call to `sed`,
as the former is only shipped on systems that have the `nroff` formatter
installed.
This commit is contained in:
Frank LENORMAND 2016-11-03 14:57:55 +03:00
parent 6347787cf2
commit 277117f64b
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rc/core/doc.kak
View File

@ -1,19 +1,21 @@
decl str docsclient
def -hidden -params 1..2 _doc-open %{ def -hidden -params 1..2 _doc-open %{
%sh{ %sh{
manout=$(mktemp /tmp/kak-man-XXXXXX) manout=$(mktemp /tmp/kak-man-XXXXXX)
colout=$(mktemp /tmp/kak-man-XXXXXX)
MANWIDTH=${kak_window_width} man "$1" > $manout # Those options are handled by the `man-db` implementation
retval=$? export MAN_KEEP_FORMATTING=y
export MANWIDTH=${kak_window_width}
col -b -x > ${colout} < ${manout} # The BSD implementation requires an `-l` flag to detect a filetype as argument
rm ${manout} if man -l "$1" > "${manout}"; then
sed -i 's/.\x8//g' "${manout}"
if [ "${retval}" -eq 0 ]; then
printf %s\\n " printf %s\\n "
edit! -scratch '*doc*' edit! -scratch '*doc*'
exec |cat<space>${colout}<ret>gg exec |cat<space>${manout}<ret>gg
nop %sh{rm ${colout}} nop %sh{rm ${manout}}
set buffer filetype man set buffer filetype man
" "
@ -23,7 +25,7 @@ def -hidden -params 1..2 _doc-open %{
fi fi
else else
printf %s\\n "echo -color Error %{doc '$@' failed: see *debug* buffer for details}" printf %s\\n "echo -color Error %{doc '$@' failed: see *debug* buffer for details}"
rm ${colout} rm ${manout}
fi fi
} }
} }