removed some more importenv.pl and remove hostname.pl.

diff --git a/scripts/archival/shared_snarfer.pl b/scripts/archival/shared_snarfer.pl
index 9edc41427297fde85a2349f197ca938c2d1e420a..2d778b4aac7d84b6ff6e24583475b13f99e5f9c0 100644 (file)
--- a/scripts/archival/shared_snarfer.pl
+++ b/scripts/archival/shared_snarfer.pl
@@ -21,12 +21,12 @@
 ###############################################################################
 
 require "filename_helper.pl";
-require "hostname.pl";
-require "importenv.pl";
 require "inc_num.pl";
 
 use Cwd;
+use Sys::Hostname;
 use File::Which;
+use Env qw(FEISTY_MEOW_SCRIPTS TMP);
 
 $null_log = "/dev/null";
 
@@ -74,7 +74,8 @@ sub initialize_snarfer {
 
 # returns the current hostname, but without any domain included.
 sub short_hostname {
-  local($temphost) = &hostname();
+  local($temphost) = hostname();
+#&hostname();
   $temphost =~ s/([^.]*)\..*/\1/;
   return &lower($temphost);
 }
@@ -84,12 +85,6 @@ sub short_hostname {
 sub snarf_prefix {
   local($base) = @_;
   $date_tool = "date";
-
-#  if ($OS =~ /win/i) {
-#    # just hope that this is running under msys in our build bin.
-#    $date_tool = "$PRODUCTION_DIR/msys/bin/date";
-#  }
-
   local($date_part) = `$date_tool +%Y-%m-%d-%H%M`;
   while ($date_part =~ /[\r\n]$/) { chop $date_part; }
   local($host) = &short_hostname();

diff --git a/scripts/archival/snarf_feisty_meow.pl b/scripts/archival/snarf_feisty_meow.pl
index f58032b2ff9a17ccc57826cc3a2a5b2ea70cf2d1..e468e126f2fb7936cc3196b92c321aa747ea3bca 100644 (file)
--- a/scripts/archival/snarf_feisty_meow.pl
+++ b/scripts/archival/snarf_feisty_meow.pl
@@ -15,9 +15,10 @@
 #  version of the License.  Please send any updates to "fred@gruntose.com".   #
 ##############
 
-require "importenv.pl";
 require "shared_snarfer.pl";
 
+use Env qw(HOME);
+
 &initialize_snarfer;  # let the snarfer hook us in.
 
 # get the number attachment and increment it for the next use.

diff --git a/scripts/archival/snarf_fred_data.pl b/scripts/archival/snarf_fred_data.pl
index 54402b2e2b55a99575d289b6709d32afb0d83617..1aff83c6ace319383e2196c519cb782b0f7b01a4 100644 (file)
--- a/scripts/archival/snarf_fred_data.pl
+++ b/scripts/archival/snarf_fred_data.pl
@@ -18,9 +18,10 @@
 #  version of the License.  Please send any updates to "fred@gruntose.com".   #
 ###############################################################################
 
-require "importenv.pl";
 require "shared_snarfer.pl";
 
+use Env qw(HOME);
+
 &initialize_snarfer;
 
 # get the number we use and increment it for the next use.

diff --git a/scripts/archival/snarf_linux_config.pl b/scripts/archival/snarf_linux_config.pl
index b59e1f3fe4d841a38e91d31464943a48253a0d10..436ab523ea1ef96e3e38366d70bd8ffd1aab1153 100644 (file)
--- a/scripts/archival/snarf_linux_config.pl
+++ b/scripts/archival/snarf_linux_config.pl
@@ -15,9 +15,10 @@
 #  version of the License.  Please send any updates to "fred@gruntose.com".
 ##############
 
-require "importenv.pl";
 require "shared_snarfer.pl";
 
+use Env qw(HOME);
+
 &initialize_snarfer;
 
 # get the number we use and increment it for the next use.

diff --git a/scripts/archival/snarf_notes.pl b/scripts/archival/snarf_notes.pl
index f2e39d2e7c7a57c44dcf37b07e3da92fb46afd40..40b535eb9798a90421cf6d914e811729233b4f0c 100644 (file)
--- a/scripts/archival/snarf_notes.pl
+++ b/scripts/archival/snarf_notes.pl
@@ -18,9 +18,10 @@
 #  version of the License.  Please send any updates to "fred@gruntose.com".   #
 ###############################################################################
 
-require "importenv.pl";
 require "shared_snarfer.pl";
 
+use Env qw(HOME);
+
 &initialize_snarfer;
 
 # get the number we use and increment it for the next use.

diff --git a/scripts/archival/snarf_opensim.pl b/scripts/archival/snarf_opensim.pl
index ddf43b0fc3de80c20b66bf091085a8b8ffdd470f..6840498d2bdc822289ffa858650b4ee71aea57b8 100644 (file)
--- a/scripts/archival/snarf_opensim.pl
+++ b/scripts/archival/snarf_opensim.pl
@@ -18,9 +18,10 @@
 #  version of the License.  Please send any updates to "fred@gruntose.com".   #
 ###############################################################################
 
-require "importenv.pl";
 require "shared_snarfer.pl";
 
+use Env qw(HOME);
+
 &initialize_snarfer;  # let the snarfer hook us in.
 
 # get the number attachment and increment it for the next use.

diff --git a/scripts/archival/snarf_quartz.pl b/scripts/archival/snarf_quartz.pl
index 2e25e09ad6cb53065bb37009f4ad46c81d2004f5..b9d54a30cc913040cafd76b3a0be3ad72ac7ae98 100644 (file)
--- a/scripts/archival/snarf_quartz.pl
+++ b/scripts/archival/snarf_quartz.pl
@@ -18,9 +18,10 @@
 #  version of the License.  Please send any updates to "fred@gruntose.com".   #
 ###############################################################################
 
-require "importenv.pl";
 require "shared_snarfer.pl";
 
+use Env qw(HOME);
+
 &initialize_snarfer;
 
 # get the number we use and increment it for the next use.

diff --git a/scripts/archival/snarf_user.pl b/scripts/archival/snarf_user.pl
index 7abd79d3b19d350e054a8d6d79c54c5350f1a8c4..27991ecaf1a13956968db5bd2d59eb677335246e 100644 (file)
--- a/scripts/archival/snarf_user.pl
+++ b/scripts/archival/snarf_user.pl
@@ -18,9 +18,10 @@
 #  version of the License.  Please send any updates to "fred@gruntose.com".   #
 ###############################################################################
 
-require "importenv.pl";
 require "shared_snarfer.pl";
 
+use Env qw(HOME USER);
+
 &initialize_snarfer;
 
 # get the number we use and increment it for the next use.

diff --git a/scripts/core/generate_aliases.pl b/scripts/core/generate_aliases.pl
index ead37dac32e51d21dd2f10c8e3f7acd1044280ad..80f52b77ed4aca0476e0de1baf2f6dc582d76303 100644 (file)
--- a/scripts/core/generate_aliases.pl
+++ b/scripts/core/generate_aliases.pl
@@ -23,7 +23,7 @@
 
 require "filename_helper.pl";
 
-require "importenv.pl";
+use Env qw(BINDIR BUILD_TOP FEISTY_MEOW_DIR FEISTY_MEOW_GENERATED FEISTY_MEOW_SCRIPTS SHELL_DEBUG );
 
 # given a possible aliasable filename, this will decide whether to create a perl
 # or bash alias for it.  it needs the filename of the possible alias and the
@@ -190,8 +190,6 @@ if (length($SHELL_DEBUG)) {
 # open the alias files to be created.
 open(she, ">> $FEISTY_MEOW_GENERATED/fmc_aliases_for_scripts.sh");
 
-#print "os is $OS\n";
-
 # find the list of files in the scripts directory.
 #opendir(scripts, "$FEISTY_MEOW_SCRIPTS");
 #@shell_files = sort(readdir(scripts));

diff --git a/scripts/rev_control/cvs_fix.pl b/scripts/rev_control/cvs_fix.pl
index 51a9c25ca2d5f571f747d966cfd0eb8de471ba78..4cee4be6139d7ed900055f999947f2d43b1ed305 100644 (file)
--- a/scripts/rev_control/cvs_fix.pl
+++ b/scripts/rev_control/cvs_fix.pl
@@ -20,7 +20,6 @@
 ###############################################################################
 
 #require "filename_helper.pl";
-#require "importenv.pl";
 
 $new_cmd="cvs";
 

diff --git a/scripts/schedule/generate_reminders.pl b/scripts/schedule/generate_reminders.pl
index 5b3486755cb8fe1110ebd42e1ea3d69fce17befb..e5177c6b9eb1980fb916fe9519492d4ec9fd5b88 100644 (file)
--- a/scripts/schedule/generate_reminders.pl
+++ b/scripts/schedule/generate_reminders.pl
@@ -26,7 +26,7 @@
 # The day must be a number, followed by a space.  Anything after that
 # space is considered the description of the event.
 
-require "importenv.pl";
+use Env qw(CLOUD_DIR TMP);
 
 ##############
 

diff --git a/scripts/text/add_cr.pl b/scripts/text/add_cr.pl
index 5d64771d0fb1a4e7b93f753e06c8d7e4d906d61d..b98fdc888b9bd8367b244bbc00d787289ebf5476 100644 (file)
--- a/scripts/text/add_cr.pl
+++ b/scripts/text/add_cr.pl
@@ -19,7 +19,8 @@
 ###############################################################################
 
 require "filename_helper.pl";
-require "importenv.pl";
+
+use Env qw(TMP);
 
 $new_version = `mktemp "$TMP/zz_add_cr_tmp.XXXXXX"`;
 chop($new_version);

diff --git a/scripts/text/diff_lib.pl b/scripts/text/diff_lib.pl
index c0ffaf7a1e88dec7c6c4e864eb4a1cb734b3a2b7..6b194c2f64fcd82e1546a6a321ab7b69447a669d 100644 (file)
--- a/scripts/text/diff_lib.pl
+++ b/scripts/text/diff_lib.pl
@@ -23,9 +23,9 @@
 # support from CPAN.  this can be installed by using cpan and telling it
 #    install Text::Diff
 
-require "ctime.pl";
 require "filename_helper.pl";
-require "importenv.pl";
+
+use Env qw(FEISTY_MEOW_DIR);
 
 use Text::Diff;
 
@@ -146,7 +146,7 @@ sub print_header {
   # this function prints out the header prior to printing out any real
   # data.  if there are no diffs, the header should never get printed.
   print "$break_line\n";
-  local($printable_date) = &ctime(time);
+  local($printable_date) = scalar(localtime());
   $printable_date =~ s/\n//g;
   print "[$printable_date]\n";
   print "Left (<) is \"$temp_src\".\n";

diff --git a/scripts/text/new_sig.pl b/scripts/text/new_sig.pl
index 82b2e98a5db78ed8e02ff3ac11eeb2acd674fab1..50c55fccae3b19d2a91043bf0c7651bb94504361 100644 (file)
--- a/scripts/text/new_sig.pl
+++ b/scripts/text/new_sig.pl
@@ -19,7 +19,8 @@
 ###############################################################################
 
 require "filename_helper.pl";
-require "importenv.pl";
+
+use Env qw(HOME TMP);
 
 # creates a new signature file for outgoing email.
 local($temp_filename) = "$TMP/zz_signate";

diff --git a/scripts/text/strip_cr.pl b/scripts/text/strip_cr.pl
index c9e0dab9953fa12eac296fdbfe284722d1787701..2f32a6985d6ea4837ebfcb8aa9fd113d6163e1e7 100644 (file)
--- a/scripts/text/strip_cr.pl
+++ b/scripts/text/strip_cr.pl
@@ -19,7 +19,8 @@
 ###############################################################################
 
 require "filename_helper.pl";
-require "importenv.pl";
+
+use Env qw(TMP);
 
 $new_version = `mktemp "$TMP/zz_strip_cr_tmp.XXXXXX"`;
 chop($new_version);

diff --git a/scripts/text/text_to_url.pl b/scripts/text/text_to_url.pl
index d1feeb165af2b562420a4dc782542a226800ac78..3c3faf85d872be1313f31775b848d425b08d5909 100644 (file)
--- a/scripts/text/text_to_url.pl
+++ b/scripts/text/text_to_url.pl
@@ -20,7 +20,6 @@
 ###############################################################################
 
 #require "filename_helper.pl";
-#require "importenv.pl";
 #require "inc_num.pl";
 
 &generate_web_page(@ARGV);