X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FUtils.pm;h=fabbb816328f39cae13986a9de9a0cb633a9b645;hp=5fae3076c2f43a8f7ecd80da542f0f6b74d59e14;hb=HEAD;hpb=8ace712d58c78c04d404eb445de83547d9510f39

diff --git a/lib/Catalyst/Utils.pm b/lib/Catalyst/Utils.pm
index 5fae307..fabbb81 100644
--- a/lib/Catalyst/Utils.pm
+++ b/lib/Catalyst/Utils.pm
@@ -403,6 +403,14 @@ sub term_width {
 
     return $_term_width if $_term_width;
 
+    if ($ENV{COLUMNS} && $ENV{COLUMNS} =~ /\A\d+\z/) {
+        return $_term_width = $ENV{COLUMNS};
+    }
+
+    if (!-t STDOUT && !-t STDERR) {
+        return $_term_width = 80;
+    }
+
     if (!defined $_use_term_size_any) {
         eval {
             require Term::Size::Any;
@@ -423,12 +431,9 @@ sub term_width {
     my $width;
 
     if ($_use_term_size_any) {
-        ($width) = Term::Size::Any::chars();
+        $width = Term::Size::Any::chars(*STDERR) || Term::Size::Any::chars(*STDOUT);
     }
 
-    if (!$width && $ENV{COLUMNS} && $ENV{COLUMNS} =~ /\A\d+\z/) {
-        $width = $ENV{COLUMNS};
-    }
     if (!$width || $width < 80) {
         $width = 80;
     }