Changeset 6988

Timestamp:

2004-03-09T16:16:28+13:00 (20 years ago)

Author:

jrm21

Message:

every perl script should start with "use strict"....

use language setting in LC_ALL or LANG environment variable if not set as
an option.

File:

• trunk/gsdl/bin/script/pluginfo.pl (modified) (5 diffs)

trunk/gsdl/bin/script/pluginfo.pl

@@ -28 +28 @@
 # This program will print info about a plugin
 
-# @revision 09/05/02 Added XML usage information flag - John Thompson
+use strict;
+no strict 'subs'; # allow barewords (eg STDERR) as function arguments
 
 BEGIN {
@@ -73 +74 @@
     my $xml = 0;
 
+    my $language;
+
     if (!parsargv::parse(\@ARGV,
              q^collect/.*/^, \$collect,
@@ -78 +81 @@
              q^language/.*/^, \$language))
     {
-    &PrintUsage::print_txt_usage($options, "{pluginfo.params}", 1);
+    PrintUsage::print_txt_usage($options, "{pluginfo.params}", 1);
     die "\n";
     }
 
-    # If $language has been specified, load the appropriate resource bundle
+    # if language wasn't specified, see if it is set in the environment
+    # (LC_ALL or LANG)
+    if (!$language && ($_=$ENV{'LC_ALL'} or $_=$ENV{'LANG'})) {
+    m/^([^\.]+)\.?(.*)/;
+    $language=$1;
+# gsprintf doesn't do anything about encoding, hard-coded to iso-8859-1!!
+    # my $encoding=$2; # might be undef...
+# gsprintf::load_language* thinks "fr" is completely different to "fr_FR"...
+    $language =~ s/_.*$//;
+    }
+
+    # If $language has been set, load the appropriate resource bundle
     # (Otherwise, the default resource bundle will be loaded automatically)
     if ($language) {
-    &gsprintf::load_language_specific_resource_bundle($language);
+    gsprintf::load_language_specific_resource_bundle($language);
     }
 
     my $plugin = shift (@ARGV);
     if (!defined $plugin || $plugin eq "") {
-    &gsprintf(STDERR, "{pluginfo.no_plugin_name}\n\n");
-    &PrintUsage::print_txt_usage($options, "{pluginfo.params}", 1);
+    gsprintf(STDERR, "{pluginfo.no_plugin_name}\n\n");
+    PrintUsage::print_txt_usage($options, "{pluginfo.params}", 1);
     die "\n";
     }
@@ -108 +122 @@
     }
     else {
-    &gsprintf(STDERR, "\n{pluginfo.passing_options}\n\n");
-    &gsprintf(STDERR, "{pluginfo.option_types}:\n\n");
-    &gsprintf(STDERR, "{pluginfo.specific_options}\n\n");
-    &gsprintf(STDERR, "{pluginfo.general_options}\n\n");
-    &gsprintf(STDERR, "$plugin {pluginfo.info}:\n\n");
+    gsprintf(STDERR, "\n{pluginfo.passing_options}\n\n");
+    gsprintf(STDERR, "{pluginfo.option_types}:\n\n");
+    gsprintf(STDERR, "{pluginfo.specific_options}\n\n");
+    gsprintf(STDERR, "{pluginfo.general_options}\n\n");
+    gsprintf(STDERR, "$plugin {pluginfo.info}:\n\n");
 
     $plugobj->print_txt_usage();
@@ -125 +139 @@
     my $pager = $ENV{"PAGER"};
     if (! $pager) {$pager="(less || more)"}
-    $pid = open(STDIN, "-|"); # this does a fork... see man perlipc(1)
+    my $pid = open(STDIN, "-|"); # this does a fork... see man perlipc(1)
     if (!defined $pid) {
-    &gsprintf(STDERR, "pluginfo.pl - can't fork: $!");
+    gsprintf(STDERR, "pluginfo.pl - can't fork: $!");
     } else {
     if ($pid != 0) { # parent (ie forking) process. child gets 0