Changeset 10984 for trunk/gsdl

Timestamp:

2005-12-09T11:35:10+13:00 (18 years ago)

Author:

jrm21

Message:

move the terminal detection/pager redirection stuff from pluginfo.pl to
the usage module so that all command-line scripts using print_usage_txt()
benefit.

Location:

trunk/gsdl

Files:

• bin/script/pluginfo.pl (modified) (1 diff)
• perllib/printusage.pm (modified) (1 diff)

trunk/gsdl/bin/script/pluginfo.pl

@@ -194 +194 @@
 }
 
-
-# this causes us to automatically send output to a pager, if one is
-# set, AND our output is going to a terminal
-# active state perl on windows doesn't do open(handle, "-|");
-if ($ENV{'GSDLOS'} !~ /windows/ && -t STDOUT) {
-    my $pager = $ENV{"PAGER"};
-    if (! $pager) {$pager="(less || more)"}
-    my $pid = open(STDIN, "-|"); # this does a fork... see man perlipc(1)
-    if (!defined $pid) {
-    gsprintf(STDERR, "pluginfo.pl - can't fork: $!");
-    } else {
-    if ($pid != 0) { # parent (ie forking) process. child gets 0
-        exec ($pager);
-    }
-    }
-    open(STDERR,">&STDOUT"); # so it's easier to pipe output
-}
-
-
 &main ();

trunk/gsdl/perllib/printusage.pm

@@ -177 +177 @@
     my $programdesc = shift(@_);
 
+    # this causes us to automatically send output to a pager, if one is
+    # set, AND our output is going to a terminal
+    # active state perl on windows doesn't do open(handle, "-|");
+    if ($ENV{'GSDLOS'} !~ /windows/ && -t STDOUT) {
+        my $pager = $ENV{"PAGER"};
+    if (! $pager) {$pager="(less || more)"}
+    my $pid = open(STDIN, "-|"); # this does a fork... see man perlipc(1)
+    if (!defined $pid) {
+        gsprintf(STDERR, "pluginfo.pl - can't fork: $!");
+    } else {
+        if ($pid != 0) { # parent (ie forking) process. child gets 0
+        exec ($pager);
+        }
+    }
+    open(STDERR,">&STDOUT"); # so it's easier to pipe output
+    }
+
+
+
     my $programname = $options->{'name'};
     my $programargs = $options->{'args'};