X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Fvariables.sh;h=e66a3acaa4665ec23815006214f24b0b7a08ece8;hb=77e3aa021463bddde7b1219849b8911b1ee5c6f6;hp=9e3d1312eeb6b238c3cb4eb31fb92469f0a23b75;hpb=4e221a7e46cefe37534213e37b1c15ef0338dd4f;p=feisty_meow.git

diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index 9e3d1312..e66a3aca 100644
--- a/scripts/core/variables.sh
+++ b/scripts/core/variables.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 ##############
 
@@ -74,7 +74,7 @@ define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org
   if [ -z "$OS" ]; then
     define_yeti_variable OS=UNIX
   fi
-  define_yeti_variable IS_DARWIN=$(echo $OSTYPE | grep -i darwin)
+  define_yeti_variable IS_DARWIN="$(echo $OSTYPE | grep -i darwin)"
   
   ##############
 
@@ -190,24 +190,31 @@ define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org
   
   # variables for perl.
   
-  define_yeti_variable PERLLIB+="/usr/lib/perl5"
-  if [ "$OS" == "Windows_NT" ]; then
-    define_yeti_variable PERLIO=:perlio
-      # choose perl's IO over the ms-windows version so we can handle file
-      # bytes properly.
-  fi
+  if [[ $PERLLIB =~ .*$FEISTY_MEOW_SCRIPTS.* ]]; then
+    if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then
+      echo skipping PERLLIB since already mentions feisty meow scripts.
+    fi
+  else
+    define_yeti_variable PERLLIB+="/usr/lib/perl5"
+    if [ "$OS" == "Windows_NT" ]; then
+      define_yeti_variable PERLIO=:perlio
+        # choose perl's IO over the ms-windows version so we can handle file
+        # bytes properly.
+    fi
 
-  # iterate across our sub-directories and find the perl scripts.
-  # this currently only looks one level down.
-  for i in $FEISTY_MEOW_SCRIPTS/*; do
-    if [ -d "$i" ]; then
-      # check if there is a perl file present; add the folder to PERLLIB if so.
-      ls $i/*.pl &>/dev/null
-      if [ $? -eq 0 ]; then
-        PERLLIB+=":$(dos_to_unix_path $i)"
+    # iterate across our sub-directories and find the perl scripts.
+    # this currently only looks one level down.
+    for i in $FEISTY_MEOW_SCRIPTS/*; do
+      if [ -d "$i" ]; then
+        # check if there is a perl file present; add the folder to PERLLIB if so.
+        ls $i/*.pl &>/dev/null
+        if [ $? -eq 0 ]; then
+          PERLLIB+=":$(dos_to_unix_path $i)"
+        fi
       fi
-    fi
-  done
+    done
+  fi
+
   define_yeti_variable PERL5LIB=$PERLLIB
   #echo PERLLIB is now $PERLLIB
   
@@ -215,6 +222,12 @@ define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org
   
   # set this so nechung can find its data.
   define_yeti_variable NECHUNG=$FEISTY_MEOW_APEX/infobase/fortunes.dat
+
+  # set a personal home directory that can be overridden.
+  define_yeti_variable FEISTY_MEOW_PERSONAL_HOME
+  if [ -z "$FEISTY_MEOW_PERSONAL_HOME" ]; then
+    define_yeti_variable FEISTY_MEOW_PERSONAL_HOME="$HOME"
+  fi
   
 ##  # establish a pipe for less to see our beloved syntax highlighting.
 ##  define_yeti_variable LESSOPEN="| source-highlight -f esc -o STDOUT -i %s"
@@ -227,17 +240,29 @@ define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org
   define_yeti_variable REPOSITORY_LIST="$FEISTY_MEOW_APEX "
 
   # add in any active projects to the repository list.
-  if [ -d "$HOME/active" ]; then
-    REPOSITORY_LIST+="$(find "$HOME/active" -maxdepth 1 -mindepth 1 -type d) "
+#hmmm: resolve if still using this folder.
+  if [ -d "$FEISTY_MEOW_PERSONAL_HOME/active" ]; then
+    REPOSITORY_LIST+="$(find "$FEISTY_MEOW_PERSONAL_HOME/active" -maxdepth 1 -mindepth 1 -type d) "
+  fi
+
+  # add in any folders that are under the feisty meow applications folder.
+  define_yeti_variable FEISTY_MEOW_REPOS_SCAN
+  if [ -z "$FEISTY_MEOW_REPOS_SCAN" ]; then
+    if [ -d "$FEISTY_MEOW_PERSONAL_HOME/apps" ]; then
+      define_yeti_variable FEISTY_MEOW_REPOS_SCAN="$FEISTY_MEOW_PERSONAL_HOME/apps"
+    else
+#      echo "No value set for FEISTY_MEOW_REPOS_SCAN and no default apps folder found in home."
+      true
+    fi
   fi
-  # add in any site avenger applications that are in the applications folder.
-  if [ -d "$HOME/apps" ]; then
+  if [ -d "$FEISTY_MEOW_REPOS_SCAN" ]; then
+#hmmm: handle the repos as if they are multi value!!!
     # general search for normal project folders in apps.
-    REPOSITORY_LIST+="$(find "$HOME/apps" -maxdepth 2 -mindepth 2 -iname ".git" -type d -exec dirname {} ';') "
-    REPOSITORY_LIST+="$(find "$HOME/apps" -maxdepth 2 -mindepth 2 -iname ".svn" -type d -exec dirname {} ';') "
+    REPOSITORY_LIST+="$(find "$FEISTY_MEOW_REPOS_SCAN" -maxdepth 2 -mindepth 2 -iname ".git" -type d -exec dirname {} ';') "
+    REPOSITORY_LIST+="$(find "$FEISTY_MEOW_REPOS_SCAN" -maxdepth 2 -mindepth 2 -iname ".svn" -type d -exec dirname {} ';') "
 
     # special search for site avenger directories; they have avenger5 as second level.
-    REPOSITORY_LIST+="$(find "$HOME/apps" -maxdepth 2 -mindepth 2 -iname "avenger5" -type d) "
+    REPOSITORY_LIST+="$(find "$FEISTY_MEOW_REPOS_SCAN" -maxdepth 2 -mindepth 2 -iname "avenger5" -type d) "
   fi
   
   # the archive list is a set of directories that are major repositories of
@@ -294,7 +319,7 @@ define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org
   ##############
 
   # set the SHUNIT_PATH so our shunit tests can find the codebase.
-  define_yeti_variable SHUNIT_PATH="$FEISTY_MEOW_SCRIPTS/shunit"
+  define_yeti_variable SHUNIT_PATH="$FEISTY_MEOW_SCRIPTS/testkit/shunit"
   
   ##############