closer to recursive alias additions

[feisty_meow.git] / scripts / core / generate_aliases.pl

diff --git a/scripts/core/generate_aliases.pl b/scripts/core/generate_aliases.pl
index 50e4bd5676780b0c0868382f63fd0671c2187962..20d5bd96f57e86414a2cd9216510b22c9e94c512 100644 (file)
--- a/scripts/core/generate_aliases.pl
+++ b/scripts/core/generate_aliases.pl
@@ -23,7 +23,7 @@
 
 require "filename_helper.pl";
 
-use Env qw(FEISTY_MEOW_BINARIES BUILD_TOP FEISTY_MEOW_APEX FEISTY_MEOW_LOADING_DOCK FEISTY_MEOW_SCRIPTS SHELL_DEBUG );
+use Env qw(FEISTY_MEOW_BINARIES BUILD_TOP FEISTY_MEOW_APEX FEISTY_MEOW_LOADING_DOCK FEISTY_MEOW_SCRIPTS DEBUG_FEISTY_MEOW );
 
 # 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
@@ -61,14 +61,6 @@ sub make_perl_alias {
   print she "define_yeti_alias $aliasname=\"perl $source_dir/$full_alias.pl\"\n";
 }
 
-# given a directory, this returns an array of all the filenames found therein.
-sub load_file_names {
-  local($path) = shift(@_);
-  opendir(that_dir, $path);
-  local(@those_files) = sort(readdir(that_dir));
-  return @those_files;
-}
-
 ##############
 
 # The "common.alias" file is used in the generated aliases file as a base
@@ -78,14 +70,14 @@ sub load_file_names {
 # loaded also.
 sub rebuild_script_aliases {
 
-  if (length($SHELL_DEBUG)) {
+  if (length($DEBUG_FEISTY_MEOW)) {
     print "rebuilding generated aliases file...\n";
   }
 
   # create our generated shells directory if it's not already.
   if ( ! -d $FEISTY_MEOW_LOADING_DOCK ) {
     mkdir $FEISTY_MEOW_LOADING_DOCK;
-    if (length($SHELL_DEBUG)) {
+    if (length($DEBUG_FEISTY_MEOW)) {
       print "made FEISTY_MEOW_LOADING_DOCK at '$FEISTY_MEOW_LOADING_DOCK'\n";
     }
   }
@@ -100,7 +92,7 @@ sub rebuild_script_aliases {
   foreach $i (&glob_list("$FEISTY_MEOW_LOADING_DOCK/custom/*.alias")) {
     if (-f $i) { push(@ALIAS_DEFINITION_FILES, $i); }
   }
-  if (length($SHELL_DEBUG)) {
+  if (length($DEBUG_FEISTY_MEOW)) {
     print "using these alias files:\n";
     foreach $i (@ALIAS_DEFINITION_FILES) {
       local $base_of_dir = &basename(&dirname($i));
@@ -112,7 +104,7 @@ sub rebuild_script_aliases {
   # write the aliases for sh and bash scripts.
 
   local $GENERATED_ALIAS_FILE = "$FEISTY_MEOW_LOADING_DOCK/fmc_core_and_custom_aliases.sh";
-  if (length($SHELL_DEBUG)) {
+  if (length($DEBUG_FEISTY_MEOW)) {
     print "writing generated aliases in $GENERATED_ALIAS_FILE...\n";
   }
 
@@ -142,7 +134,7 @@ sub rebuild_script_aliases {
 
   close GENOUT;
 
-  if (length($SHELL_DEBUG)) {
+  if (length($DEBUG_FEISTY_MEOW)) {
     print("done rebuilding generated aliases file.\n");
   }
 }
@@ -184,7 +176,7 @@ if (-d $FEISTY_MEOW_BINARIES) {
 # trash the old versions.
 unlink("$FEISTY_MEOW_LOADING_DOCK/fmc_aliases_for_scripts.sh");
 
-if (length($SHELL_DEBUG)) {
+if (length($DEBUG_FEISTY_MEOW)) {
   printf "writing $FEISTY_MEOW_LOADING_DOCK/fmc_aliases_for_scripts.sh...\n";
 }
 
@@ -196,8 +188,12 @@ open(she, ">> $FEISTY_MEOW_LOADING_DOCK/fmc_aliases_for_scripts.sh");
 #@shell_files = sort(readdir(scripts));
 #print "scripts: @shell_files\n";
 
-@shell_files = (&load_file_names("$FEISTY_MEOW_SCRIPTS"),
-   &load_file_names("$FEISTY_MEOW_LOADING_DOCK/custom/scripts"));
+@shell_files = (&find_files("$FEISTY_MEOW_SCRIPTS"),
+   &find_files("$FEISTY_MEOW_LOADING_DOCK/custom/scripts"),
+   &find_files(find_directories("$FEISTY_MEOW_LOADING_DOCK/custom/scripts")));
+#really want the recursive one called here, but baby steps
+
+printf "found all these files: @shell_files\n";
 
 # construct aliases for items in the scripts directory.
 foreach $file (@shell_files) {
@@ -246,7 +242,7 @@ foreach $file (@shell_files) {
 
 # open the source repository's script directory to find scripts in there.
 local($build_shell_path) = "$BUILD_TOP/scripts/generator";
-@build_shells = &load_file_names("$build_shell_path");
+@build_shells = &find_files("$build_shell_path");
 #opendir(build_shells_dir, $build_shell_path);
 #@build_shell_files = sort(readdir(build_shells_dir));
 #if (scalar(@build_shell_files) > 0) {