updated to add new FEISTY_MEOW_APPS_DIR

this addresses a peculiarity on some machines, where we don't want the
apps dir to just be $HOME/apps.  pre-setting the variable before loading
feisty meow should allow flexibility about where the apps are actually
located.

diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index c51490ba690cab30b890ae6e5337d15328c76dff..5cc90f3e49347f5217c76525d877e5d5cb3aeb3f 100644 (file)
--- a/scripts/core/variables.sh
+++ b/scripts/core/variables.sh
@@ -234,17 +234,28 @@ 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.
+#hmmm: resolve if still using this folder.
   if [ -d "$HOME/active" ]; then
     REPOSITORY_LIST+="$(find "$HOME/active" -maxdepth 1 -mindepth 1 -type d) "
   fi
-  # add in any site avenger applications that are in the applications folder.
-  if [ -d "$HOME/apps" ]; then
+
+  # add in any folders that are under the feisty meow applications folder.
+  define_yeti_variable FEISTY_MEOW_APPS_DIR
+  if [ -z "$FEISTY_MEOW_APPS_DIR" ]; then
+    if [ -d "$HOME/apps" ]; then
+      define_yeti_variable FEISTY_MEOW_APPS_DIR="$HOME/apps"
+    else
+#      echo "No value set for FEISTY_MEOW_APPS_DIR and no default apps folder found in home."
+      true
+    fi
+  fi
+  if [ -d "$FEISTY_MEOW_APPS_DIR" ]; then
     # 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_APPS_DIR" -maxdepth 2 -mindepth 2 -iname ".git" -type d -exec dirname {} ';') "
+    REPOSITORY_LIST+="$(find "$FEISTY_MEOW_APPS_DIR" -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_APPS_DIR" -maxdepth 2 -mindepth 2 -iname "avenger5" -type d) "
   fi
   
   # the archive list is a set of directories that are major repositories of

diff --git a/scripts/site_avenger/config/default.app b/scripts/site_avenger/config/default.app
index 46dbd3a76da5e16e975650c6e127a1f8b441673b..8ec6ddc2c54e2097a7fa0e134f17e92adba3d9a5 100644 (file)
--- a/scripts/site_avenger/config/default.app
+++ b/scripts/site_avenger/config/default.app
@@ -13,7 +13,7 @@
 
 # the top level of the user's application storage.
 if [ -z "$BASE_APPLICATION_PATH" ]; then
-  export BASE_APPLICATION_PATH="$HOME/apps"
+  export BASE_APPLICATION_PATH="$FEISTY_MEOW_APPS_DIR"
 fi
 # where the code should come from.
 if [ -z "$DEFAULT_REPOSITORY_ROOT" ]; then

diff --git a/scripts/site_avenger/revamp_cakelampvm_v002.sh b/scripts/site_avenger/revamp_cakelampvm_v002.sh
index 1565060572d186be846092d7e0e134d2eacf665d..93d0302cfa396737e93f108779164a930ae92f97 100644 (file)
--- a/scripts/site_avenger/revamp_cakelampvm_v002.sh
+++ b/scripts/site_avenger/revamp_cakelampvm_v002.sh
@@ -112,8 +112,10 @@ exit_on_error "group perms on feisty meow"
 # fix perms for fred user.
 chown -R fred:fred /home/fred /home/archives/stuffing /home/fred/.[a-zA-Z0-9]*
 exit_on_error "chown fred home"
-group_perm $HOME/apps
-exit_on_error "group perms on fred's apps"
+if [ -d "$FEISTY_MEOW_APPS_DIR" ]; then
+  group_perm $FEISTY_MEOW_APPS_DIR
+  exit_on_error "group perms on fred's apps"
+fi
 harsh_perm /home/fred/.ssh
 exit_on_error "harsh_perm setting on fred .ssh"
 group_perm /home/fred/apps/mapsdemo

diff --git a/scripts/system/add_apache_site.sh b/scripts/system/add_apache_site.sh
index d3d4595d454bd82869da551a3593098c0936a3c4..ad94e2f993e8d712902740839c2ad5d9f4114115 100644 (file)
--- a/scripts/system/add_apache_site.sh
+++ b/scripts/system/add_apache_site.sh
@@ -12,7 +12,7 @@ source "$FEISTY_MEOW_SCRIPTS/system/common_sysadmin.sh"
 # some convenient defaults for our current usage.
 
 if [ -z "$BASE_APPLICATION_PATH" ]; then
-  BASE_APPLICATION_PATH="$HOME/apps"
+  BASE_APPLICATION_PATH="$FEISTY_MEOW_APPS_DIR"
 fi
 if [ -z "$STORAGE_SUFFIX" ]; then
   STORAGE_SUFFIX="/public"

diff --git a/scripts/system/remove_apache_site.sh b/scripts/system/remove_apache_site.sh
index 6d23e7ab7205e3a146ee0e359a8627a4bc914ff7..0156846076a77e78728dec4e5319780f8b7b1725 100644 (file)
--- a/scripts/system/remove_apache_site.sh
+++ b/scripts/system/remove_apache_site.sh
@@ -12,7 +12,7 @@ source "$FEISTY_MEOW_SCRIPTS/system/common_sysadmin.sh"
 # some convenient defaults for our current usage.
 
 if [ -z "$BASE_APPLICATION_PATH" ]; then
-  BASE_APPLICATION_PATH="$HOME/apps"
+  BASE_APPLICATION_PATH="$FEISTY_MEOW_APPS_DIR"
 fi
 if [ -z "$STORAGE_SUFFIX" ]; then
   STORAGE_SUFFIX="/public"