added is darwin check inside the prep script

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

diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index 5a0c0b7bd463ec36a9e978661c46a16d654095e6..e66a3acaa4665ec23815006214f24b0b7a08ece8 100644 (file)
--- a/scripts/core/variables.sh
+++ b/scripts/core/variables.sh
@@ -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)"
   
   ##############
 
@@ -241,28 +241,28 @@ define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org
 
   # add in any active projects to the repository list.
 #hmmm: resolve if still using this folder.
-  if [ -d "$HOME/active" ]; then
-    REPOSITORY_LIST+="$(find "$HOME/active" -maxdepth 1 -mindepth 1 -type d) "
+  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_SCAN_REPOS
-  if [ -z "$FEISTY_MEOW_SCAN_REPOS" ]; then
-    if [ -d "$HOME/apps" ]; then
-      define_yeti_variable FEISTY_MEOW_SCAN_REPOS="$HOME/apps"
+  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_SCAN_REPOS and no default apps folder found in home."
+#      echo "No value set for FEISTY_MEOW_REPOS_SCAN and no default apps folder found in home."
       true
     fi
   fi
-  if [ -d "$FEISTY_MEOW_SCAN_REPOS" ]; 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 "$FEISTY_MEOW_SCAN_REPOS" -maxdepth 2 -mindepth 2 -iname ".git" -type d -exec dirname {} ';') "
-    REPOSITORY_LIST+="$(find "$FEISTY_MEOW_SCAN_REPOS" -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 "$FEISTY_MEOW_SCAN_REPOS" -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