much nicer version for recustomize, now actually preserves earlier behavior that

[feisty_meow.git] / scripts / core / variables.sh

diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index f40dfc4f81dc76486b5f320fb4b7bb030e33ac28..9f6f61cca5b31d7c212305092051269f955044a1 100644 (file)
--- a/scripts/core/variables.sh
+++ b/scripts/core/variables.sh
@@ -16,7 +16,7 @@
 export PS1='\u@\h $ ';
 # sets the history length and max file size so we can get some long history around here.
 export HISTSIZE=1000000
-export HISTFILESIZE=2000000
+export HISTFILESIZE=8000000
   
 ##############
   
@@ -37,6 +37,22 @@ if [ -z "$NECHUNG" ]; then
   fi
   export IS_DARWIN=$(echo $OSTYPE | grep -i darwin)
   
+  ##############
+
+  # guess the current platform.
+  IS_UNIX=$(uname | grep -i linux)
+  if [ -z "$IS_UNIX" ]; then IS_UNIX=$(uname | grep -i unix); fi
+  if [ -z "$IS_UNIX" ]; then IS_UNIX=$(uname | grep -i darwin); fi
+  IS_DOS=$(uname | grep -i ming)
+  if [ -z "$IS_DOS" ]; then IS_DOS=$(uname | grep -i cygwin); fi
+
+  # now if we're stuck in DOS, try to determine the type of system.
+  if [ ! -z "$IS_DOS" ]; then
+    # IS_MSYS will be non-empty if this is the msys toolset.  otherwise
+    # we assume that it's cygwin.
+    IS_MSYS=$(uname | grep -i ming)
+  fi
+
   ##############
   
   # fallbacks to set crucial variables for feisty meow...
@@ -47,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
   
@@ -63,8 +79,8 @@ if [ -z "$NECHUNG" ]; then
   ##############
   
   # umask sets a permission mask for all file creations.  the mask used here
-  # disallows writing by the "group" and "others" categories.
-  umask 022
+  # disallows writes by the "group" and disallows "others" completely.
+  umask 027
   # ulimit sets user limits.  we set the maximum allowed core dump file size
   # to zero, because it is obnoxious to see the core dumps from crashed
   # programs lying around everywhere.
@@ -116,8 +132,10 @@ if [ -z "$NECHUNG" ]; then
   export GIT_SSH=$FEISTY_MEOW_SCRIPTS/security/ssh.sh
   
   # the base checkout list is just to update feisty_meow.  additional folder
-  # names can be added in your customized scripts.
-  export REPOSITORY_LIST="feisty_meow"
+  # names can be added in your customized scripts.  the space at the end of
+  # this variable is important and allows users to extend the list like:
+  #    export REPOSITORY_DIR+="muppets configs"
+  export REPOSITORY_LIST="feisty_meow "
   
   # initializes the feisty meow build variables, if possible.
   function initialize_build_variables()
@@ -126,7 +144,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"
@@ -159,11 +177,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"
   
   ##############