From: Chris Koeritz <fred@gruntose.com>
Date: Thu, 2 Feb 2017 18:58:07 +0000 (-0500)
Subject: spelunking nightmare
X-Git-Tag: 2.140.90~242
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=888860ef4cc701a098790d924e5330543a2c146f;p=feisty_meow.git

spelunking nightmare

did not remember perl regex enough to get this right on first several tries, but it seems to be omitting the customize folder properly, as it should, now.
---

diff --git a/scripts/core/generate_aliases.pl b/scripts/core/generate_aliases.pl
index fa4cc24a..b6f6cd67 100644
--- a/scripts/core/generate_aliases.pl
+++ b/scripts/core/generate_aliases.pl
@@ -210,15 +210,16 @@ foreach $file (@shell_files) {
       || $file =~ /\/\.\.$/
       || $file =~ /\/\.svn$/
       || $file =~ /\/\.git$/
-      || $file =~ /^.*\/customize\/.*$/
+      || $file =~ /\/customize\//
+#hmmm: would be nice to have this name in a symbol somewhere instead of having "customize" everywhere.
       ) {
     # just skip this item; it's a special directory.
 #print "skipping name: $file\n";
-  } elsif (-d "$FEISTY_MEOW_SCRIPTS/$file" && ! $file =~ /^.*\/customize\/.*$/) {
+  } elsif (-d "$FEISTY_MEOW_SCRIPTS/$file") {
     # if we see a subdirectory in the scripts folder, we add all the
     # scripts in it as aliases.  we recurse only one level.  we also don't use
     # our customize directory as aliases, since those are processed way differently.
-#print "adding script dir in: $file\n";
+print "adding script dir in: $file\n";
     opendir(subdir, "$FEISTY_MEOW_SCRIPTS/$file");
     @subdir_files = sort(readdir(subdir));
     foreach $subfile (@subdir_files) {
@@ -228,16 +229,17 @@ foreach $file (@shell_files) {
     # if we see a file in the auto-generated area that comes from the
     # customized scripts folder, we add it as an alias.
     make_alias($file, "$FEISTY_MEOW_LOADING_DOCK/custom/scripts/");
-#print "added custom script file: $FEISTY_MEOW_LOADING_DOCK/custom/scripts/$file\n";
+print "added custom script file: $FEISTY_MEOW_LOADING_DOCK/custom/scripts/$file\n";
   } else {
     # last ditch effort to make sense of the file; just go ahead and make an alias unless
     # the file is part of our customization scheme.
-#hmmm: would be nice to have this name in a symbol somewhere instead of having "customize" everywhere.
-    if ( ! $file =~ /^.*\/customize\/.*$/ ) {
+    if ( ! ($file =~ /customize/) ) {
 #print "adding regular file in: $file\n";
       # if it's a regular file, we'll try to make an alias for it.  the function
       # will only fire if the ending is appropriate for the script languages we use.
       &make_alias($file, "$FEISTY_MEOW_SCRIPTS");
+    } else {
+print "omitting file in: $file\n";
     }
   }
 }