Merge branch 'main' of feistymeow.org:feisty_meow

[feisty_meow.git] / scripts / text / diff_lib.pl

diff --git a/scripts/text/diff_lib.pl b/scripts/text/diff_lib.pl
index 7d60e8605716d121d05466019833284fef04b3a4..158f205caf8caab170ed228bf03f3025493710c1 100644 (file)
--- a/scripts/text/diff_lib.pl
+++ b/scripts/text/diff_lib.pl
@@ -25,7 +25,7 @@
 
 require "filename_helper.pl";
 
-use Env qw(FEISTY_MEOW_DIR);
+use Env qw(FEISTY_MEOW_APEX);
 
 use Text::Diff;
 
@@ -119,7 +119,7 @@ sub diff_dirs {
     @name_components = split(/\//, $filename);
     $basename = $name_components[$#name_components];
 #    print "doing diff of $filename against $compare_directory/$basename\n";
-    &do_diff($filename, $compare_directory."/".$basename);
+    &compute_file_differences($filename, $compare_directory."/".$basename);
   }
   closedir CURDIR;
 
@@ -191,7 +191,7 @@ synch_build:
 This program needs one directory name to be passed on the command line.
 This directory is where the installation's executable files live.  Any files
 that are in the installation bin directory will be compared against the files
-in the build repository (specified by an environment variable FEISTY_MEOW_DIR).
+in the build repository (specified by an environment variable FEISTY_MEOW_APEX).
 If files differ, they will be copied from the repository into the installation
 directory.
 ";
@@ -222,7 +222,7 @@ sub change_to_saw_same {
 
 # checks the differences between the two files and creates appropriate output.
 
-sub do_diff {
+sub compute_file_differences {
   local($first, $second) = @_; 
 
   # turn stupid pc slashes into normal ones.
@@ -490,12 +490,12 @@ sub synchronize_against_build
   }
 
 #  print "install=$install_directory\n";
-#  print "repos=$FEISTY_MEOW_DIR\n";
+#  print "repos=$FEISTY_MEOW_APEX\n";
 
   # iterate over all the files in the source directory.
   opendir CURDIR, $install_directory
       || die("couldn't open $install_directory for reading.\n");
-  $compare_directory = "$FEISTY_MEOW_DIR/dll";
+  $compare_directory = "$FEISTY_MEOW_APEX/dll";
   foreach $filename (readdir CURDIR) {
     if ( ($filename eq ".") || ($filename eq "..") ) { next; }
     if (! ($filename =~ /\.dll$/)) { next; }
@@ -514,7 +514,7 @@ sub synchronize_against_build
   # repeat for the exe directory.
   opendir CURDIR, $install_directory
       || die("couldn't open $install_directory for reading.\n");
-  $compare_directory = "$FEISTY_MEOW_DIR/exe";
+  $compare_directory = "$FEISTY_MEOW_APEX/exe";
   foreach $filename (readdir CURDIR) {
     if ( ($filename eq ".") || ($filename eq "..") ) { next; }
     if (! ($filename =~ /\.exe$/)) { next; }