X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Fvariables.sh;h=bb7878c92ca1b6596a02b9a8354125d8f071abca;hb=c041a073fe44baafa4ebcb516c7d377d52fff054;hp=f3c1972a8cae23b67f9bc14cc9abfffa4d406ad9;hpb=2cc6bf514ccde007ac328907f1cf124295fb92f2;p=feisty_meow.git diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh index f3c1972a..bb7878c9 100644 --- a/scripts/core/variables.sh +++ b/scripts/core/variables.sh @@ -63,7 +63,7 @@ if [ -z "$NECHUNG" ]; then if [ -z "$FEISTY_MEOW_DIR" ]; then if [ -d "$HOME/feisty_meow" ]; then export FEISTY_MEOW_DIR="$HOME/feisty_meow" - export FEISTY_MEOW_SCRIPTS="$FEISTY_MEOW_DIR/scripts" + export FEISTY_MEOW_SCRIPTS="$FEISTY_MEOW_SCRIPTS" fi fi @@ -142,7 +142,7 @@ if [ -z "$NECHUNG" ]; then # we need to know the feisty meow directory, or we bail. if [ -z "$FEISTY_MEOW_DIR" ]; then return; fi # pick from our expected generator folder, but make sure it's there... - buildvars="$FEISTY_MEOW_DIR/scripts/generator/build_variables.sh" + buildvars="$FEISTY_MEOW_SCRIPTS/generator/build_variables.sh" if [ -f "$buildvars" ]; then # yep, that one looks good, so pull in the build defs. source "$buildvars" "$buildvars" @@ -175,11 +175,9 @@ if [ -z "$NECHUNG" ]; then ############## - # set the path for locating applications. this is done after any + # add to the PATH variables used for locating applications. this step is taken after any # potential overrides from the user. - #export PATH="$(dos_to_msys_path $BINDIR):$(dos_to_msys_path $FEISTY_MEOW_GENERATED):$PATH:/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/lib:/usr/games:/usr/bin:." - export PATH="$FEISTY_MEOW_GENERATED:$PATH:/sbin:." -###noise! :/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/lib:/usr/games:/usr/bin:. + export PATH="$FEISTY_MEOW_GENERATED:$PATH:$(find /usr/local/games -maxdepth 1 -type d -exec echo -n {}: ';' 2>/dev/null)/sbin" ##############