diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rwxr-xr-x | Util/helpfiles | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index a39d98482..7c58e010c 100644 --- a/ChangeLog +++ b/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. diff --git a/Util/helpfiles b/Util/helpfiles index 9909a1d26..699ca8321 100755 --- a/Util/helpfiles +++ b/Util/helpfiles @@ -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); |