Skip to content

Commit

Permalink
prefer col -bx to colcrt in helpfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
m0vie authored and Peter Stephenson committed Feb 18, 2014
1 parent bc160bc commit cf02c2f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
2 changes: 2 additions & 0 deletions ChangeLog
@@ -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.

Expand Down
12 changes: 6 additions & 6 deletions Util/helpfiles
Expand Up @@ -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);
Expand Down

0 comments on commit cf02c2f

Please sign in to comment.