From c5d44af5a928ffcfe0dc059e0858f57e4b7dd13c Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Thu, 2 Feb 2017 13:27:08 -0500 Subject: [PATCH] resolvinations got a bunch of weird issues resolved after having moved the customize folder down into scripts; it was loading all those things into the environment, which is really wrong. this is still a noisy version for generate aliases though. must fix. --- scripts/core/generate_aliases.pl | 28 +++++++++++++++++++++----- scripts/customize/fred/java_profile.sh | 2 +- scripts/customize/fred/refred.sh | 2 +- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/scripts/core/generate_aliases.pl b/scripts/core/generate_aliases.pl index 968cf360..a9542306 100644 --- a/scripts/core/generate_aliases.pl +++ b/scripts/core/generate_aliases.pl @@ -210,11 +210,20 @@ foreach $file (@shell_files) { || $file =~ /\/\.\.$/ || $file =~ /\/\.svn$/ || $file =~ /\/\.git$/ +|| $file =~ /^.*\/customize\/.*$/ ) { # just skip this item; it's a special directory. - } elsif (-d "$FEISTY_MEOW_SCRIPTS/$file") { +print "skipping name: $file\n"; + } elsif (-d "$FEISTY_MEOW_SCRIPTS/$file" + +&& ! $file =~ /^.*\/customize\/.*$/ + +) { # 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"; + opendir(subdir, "$FEISTY_MEOW_SCRIPTS/$file"); @subdir_files = sort(readdir(subdir)); foreach $subfile (@subdir_files) { @@ -224,11 +233,20 @@ 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 { - # 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 ( ! $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"); + + } + } } diff --git a/scripts/customize/fred/java_profile.sh b/scripts/customize/fred/java_profile.sh index 30128a22..672df77d 100644 --- a/scripts/customize/fred/java_profile.sh +++ b/scripts/customize/fred/java_profile.sh @@ -6,7 +6,7 @@ ############################ -source $FEISTY_MEOW_SCRIPTS/core/functions.sh +source "$FEISTY_MEOW_SCRIPTS/core/functions.sh" # this reports when we have totally failed to figure out where a folder # is actually located on the machine. diff --git a/scripts/customize/fred/refred.sh b/scripts/customize/fred/refred.sh index 73ea1600..fb33e9e3 100644 --- a/scripts/customize/fred/refred.sh +++ b/scripts/customize/fred/refred.sh @@ -12,7 +12,7 @@ function refred() if [[ $0 =~ .*refred\.sh.* ]]; then THISDIR="$( \cd "$(\dirname "$0")" && /bin/pwd )" export LIGHTWEIGHT_INIT=true - source "$THISDIR/../../scripts/core/launch_feisty_meow.sh" + source "$THISDIR/../../core/launch_feisty_meow.sh" refred fi -- 2.34.1