From: Chris Koeritz <fred@gruntose.com>
Date: Sun, 29 Jan 2012 19:50:26 +0000 (-0500)
Subject: Merge branch 'master' of ssh://feistymeow.org/feisty_meow
X-Git-Tag: 2.140.90~1656
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=3ea085ec301ed1399dfa1e9f3a240312dc95410b;hp=-c;p=feisty_meow.git

Merge branch 'master' of ssh://feistymeow.org/feisty_meow
---

3ea085ec301ed1399dfa1e9f3a240312dc95410b
diff --combined scripts/core/profile.sh
index c6d09746,7f03bf89..5421d9ed
--- a/scripts/core/profile.sh
+++ b/scripts/core/profile.sh
@@@ -3,21 -3,22 +3,21 @@@
  #
  # This file takes the place of .profile or other initialization scripts.
  
 -#export SHELL_DEBUG=
  export SHELL_DEBUG=true
    # this variable causes the scripts that listen to it to print more information
    # when they run.
  
  ####fault--repeated code from bootstrap.  isolate to shared location.
- # GENERADIR is where the generated files yeti uses are located.
- export GENERADIR="$HOME/.zz_auto_gen"
+ # FEISTY_MEOW_GENERATED is where the generated files yeti uses are located.
+ export FEISTY_MEOW_GENERATED="$HOME/.zz_auto_gen"
  if [ ! -z "$WINDIR" -o ! -z "$windir" ]; then
    # assume they are using windoze.
-   export GENERADIR="$TMP/zz_auto_gen"
+   export FEISTY_MEOW_GENERATED="$TMP/zz_auto_gen"
  fi
  
  # make sure our main variables are established.
- YETIVARS="$GENERADIR/yeti_variables.sh"
- if [ ! -f "$YETIVARS" ]; then
+ GENERATED_FEISTY_MEOW_VARIABLES="$FEISTY_MEOW_GENERATED/feisty_meow_variables.sh"
+ if [ ! -f "$GENERATED_FEISTY_MEOW_VARIABLES" ]; then
    echo -e '\n\n'
    echo "The yeti scripts need to be initialized via the bootstrap process, e.g.:"
    echo "  bash $HOME/feisty_meow/scripts/core/bootstrap_shells.sh"
@@@ -25,7 -26,7 +25,7 @@@
  fi
  
  # pull in our variable set.
- source "$YETIVARS"
+ source "$GENERATED_FEISTY_MEOW_VARIABLES"
  
  # define a default name, if one wasn't already set.
  if [ -z "$NAME" ]; then
@@@ -40,14 -41,14 +40,14 @@@ if [ "$OS" == "Windows_NT" ]; the
      export HOME=/c/home
    fi
    if [ ! -d "$HOME" ]; then mkdir $HOME; fi
- ##  export GENERADIR=$TMP/zz_auto_gen
+ ##  export FEISTY_MEOW_GENERATED=$TMP/zz_auto_gen
  fi
  
  if [ -z "$LIGHTWEIGHT_INIT" ]; then
    # perform the bulk of the login.
-   source $SHELLDIR/core/unix_login.sh
+   source $FEISTY_MEOW_SCRIPTS/core/unix_login.sh
  else
    # this is the lightweight login that just wants variables set.
-   source $SHELLDIR/core/lightweight_unix_login.sh
+   source $FEISTY_MEOW_SCRIPTS/core/lightweight_unix_login.sh
  fi