projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
simple soapbox drive comparator
[feisty_meow.git]
/
scripts
/
core
/
generate_aliases.pl
diff --git
a/scripts/core/generate_aliases.pl
b/scripts/core/generate_aliases.pl
index a95423068e6f3c027acc6362ae8a16da329109f2..50e4bd5676780b0c0868382f63fd0671c2187962 100644
(file)
--- a/
scripts/core/generate_aliases.pl
+++ b/
scripts/core/generate_aliases.pl
@@
-91,7
+91,7
@@
sub rebuild_script_aliases {
}
# test if we can use color in ls...
}
# test if we can use color in ls...
- $test_color=` ls --help 2>&1 | grep -i color `;
+
#
$test_color=` ls --help 2>&1 | grep -i color `;
# this is an array of files from which to draw alias definitions.
@ALIAS_DEFINITION_FILES = ("$FEISTY_MEOW_SCRIPTS/core/common.alias");
# this is an array of files from which to draw alias definitions.
@ALIAS_DEFINITION_FILES = ("$FEISTY_MEOW_SCRIPTS/core/common.alias");
@@
-126,11
+126,11
@@
sub rebuild_script_aliases {
print GENOUT "## please do not edit.\n";
print GENOUT "##\n";
print GENOUT "## please do not edit.\n";
print GENOUT "##\n";
- if (length($test_color)) {
-
print GENOUT "export color_add=--color=auto
\n";
- } else {
- print GENOUT "export color_add=\n";
- }
+
#
if (length($test_color)) {
+
# print GENOUT "export color_add='--color=auto'
\n";
+
#
} else {
+
#
print GENOUT "export color_add=\n";
+
#
}
# plow in the full set of aliases into the file.
foreach $i (@ALIAS_DEFINITION_FILES) {
# plow in the full set of aliases into the file.
foreach $i (@ALIAS_DEFINITION_FILES) {
@@
-210,20
+210,16
@@
foreach $file (@shell_files) {
|| $file =~ /\/\.\.$/
|| $file =~ /\/\.svn$/
|| $file =~ /\/\.git$/
|| $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.
) {
# just skip this item; it's a special directory.
-print "skipping name: $file\n";
- } elsif (-d "$FEISTY_MEOW_SCRIPTS/$file"
-
-&& ! $file =~ /^.*\/customize\/.*$/
-
-) {
+#print "skipping name: $file\n";
+ } elsif (-d "$FEISTY_MEOW_SCRIPTS/$file") {
# if we see a subdirectory in the scripts folder, we add all the
# if we see a subdirectory in the scripts folder, we add all the
- # scripts in it as aliases. we recurse only one level.
-
-print "adding script dir in: $file\n";
-
+ # 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";
opendir(subdir, "$FEISTY_MEOW_SCRIPTS/$file");
@subdir_files = sort(readdir(subdir));
foreach $subfile (@subdir_files) {
opendir(subdir, "$FEISTY_MEOW_SCRIPTS/$file");
@subdir_files = sort(readdir(subdir));
foreach $subfile (@subdir_files) {
@@
-233,20
+229,18
@@
print "adding script dir in: $file\n";
# 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/");
# 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 {
} else {
-
-
- if ( ! $file =~ /^.*\/customize\/.*$/ ) {
-
-print "adding regular file in: $file\n";
-
+ # 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.
+ 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");
# 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";
}
}
-
}
}
}
}