mirror/ zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-05-20 06:56:05 +02:00
Code

prefer col -bx to colcrt in helpfiles

This commit is contained in:
m0viefreak 2014-02-17 05:07:59 +01:00 committed by Peter Stephenson
parent bc160bc585
commit cf02c2f0f3
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2014-02-18 Peter Stephenson <p.w.stephenson@ntlworld.com>
* m0viefreak: Util/helpfiles: 32402: prefer col -bx to colcrt.
* m0viefreak: Util/helpfiles: 32405: Util/helpfiles: remove old
example now shell code is integrated in distribution.

12
Util/helpfiles
View File

@ -67,17 +67,17 @@ if(system('man ' . $args) || !(-s $mantmp)) {
}
$args = "$mantmp >$coltmp";
unlink($coltmp);
&Info('attempting colcrt - ', $args);
if(system('colcrt - ' . $args) || !(-s $coltmp)) {
unlink($coltmp);
&Info('attempting col -bx <', $args);
&Info('attempting col -bx <', $args);
# The x is necessary so that spaces don't turn into tabs, which messes
# up the calculations of indentation on machines which randomly wrap lines
# round to the previous line (so you see what we're up against).
if(system('col -bx <' . $args) || !(-s $coltmp)) {
if(system('col -bx <' . $args) || !(-s $coltmp)) {
unlink($coltmp);
&Info('attempting colcrt - ', $args);
if(system('colcrt - ' . $args) || !(-s $coltmp)) {
unlink($mantmp);
unlink($coltmp);
&Die('colcrt and col -bx both failed');
&Die('col -bx and colcrt - both failed');
}
}
unlink($mantmp) || &Die('cannot remove tempfile ', $mantmp);