updated to use FEISTY_MEOW_SCAN_REPOS variable instead

of FEISTY_MEOW_APPS_DIR variable, which is annoyingly conflicted.
the scan repos is currently single value, but we need to support
multi value in the future.

diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index 5cc90f3e49347f5217c76525d877e5d5cb3aeb3f..9804501748ffde4a90a1cd95b1aa7285bed64230 100644 (file)
--- a/scripts/core/variables.sh
+++ b/scripts/core/variables.sh
@@ -240,22 +240,23 @@ define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org
   fi
 
   # 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
+  define_yeti_variable FEISTY_MEOW_SCAN_REPOS
+  if [ -z "$FEISTY_MEOW_SCAN_REPOS" ]; then
     if [ -d "$HOME/apps" ]; then
-      define_yeti_variable FEISTY_MEOW_APPS_DIR="$HOME/apps"
+      define_yeti_variable FEISTY_MEOW_SCAN_REPOS="$HOME/apps"
     else
-#      echo "No value set for FEISTY_MEOW_APPS_DIR and no default apps folder found in home."
+#      echo "No value set for FEISTY_MEOW_SCAN_REPOS and no default apps folder found in home."
       true
     fi
   fi
-  if [ -d "$FEISTY_MEOW_APPS_DIR" ]; then
+  if [ -d "$FEISTY_MEOW_SCAN_REPOS" ]; then
+#hmmm: handle the repos as if they are multi value!!!
     # general search for normal project folders in apps.
-    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 {} ';') "
+    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 {} ';') "
 
     # special search for site avenger directories; they have avenger5 as second level.
-    REPOSITORY_LIST+="$(find "$FEISTY_MEOW_APPS_DIR" -maxdepth 2 -mindepth 2 -iname "avenger5" -type d) "
+    REPOSITORY_LIST+="$(find "$FEISTY_MEOW_SCAN_REPOS" -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 8ec6ddc2c54e2097a7fa0e134f17e92adba3d9a5..6a2d9a26de49ef0d61731651cdef0f2fcb702613 100644 (file)
--- a/scripts/site_avenger/config/default.app
+++ b/scripts/site_avenger/config/default.app
@@ -13,7 +13,8 @@
 
 # the top level of the user's application storage.
 if [ -z "$BASE_APPLICATION_PATH" ]; then
-  export BASE_APPLICATION_PATH="$FEISTY_MEOW_APPS_DIR"
+  export BASE_APPLICATION_PATH="$FEISTY_MEOW_SCAN_REPOS"
+#hmmm: fix for multivalue usage!
 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 93d0302cfa396737e93f108779164a930ae92f97..7d50a0573d20f4009bb183434ee1d240a2f57dfb 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"
-if [ -d "$FEISTY_MEOW_APPS_DIR" ]; then
-  group_perm $FEISTY_MEOW_APPS_DIR
+
+#hmmm: argh, wrong check!  can't check a multi-value if it's a directory or not!!!
+if [ -d "$FEISTY_MEOW_SCAN_REPOS" ]; then
+  group_perm $FEISTY_MEOW_SCAN_REPOS
   exit_on_error "group perms on fred's apps"
 fi
 harsh_perm /home/fred/.ssh

diff --git a/scripts/system/add_apache_site.sh b/scripts/system/add_apache_site.sh
index ad94e2f993e8d712902740839c2ad5d9f4114115..b3703ae01645679db6f599d98ba317de54d002a8 100644 (file)
--- a/scripts/system/add_apache_site.sh
+++ b/scripts/system/add_apache_site.sh
@@ -12,7 +12,8 @@ source "$FEISTY_MEOW_SCRIPTS/system/common_sysadmin.sh"
 # some convenient defaults for our current usage.
 
 if [ -z "$BASE_APPLICATION_PATH" ]; then
-  BASE_APPLICATION_PATH="$FEISTY_MEOW_APPS_DIR"
+  BASE_APPLICATION_PATH="$FEISTY_MEOW_SCAN_REPOS"
+#hmmm: take just first item from the repos list!
 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 0156846076a77e78728dec4e5319780f8b7b1725..9e21fa31e82911d9c3b26e4756c1098313c9713e 100644 (file)
--- a/scripts/system/remove_apache_site.sh
+++ b/scripts/system/remove_apache_site.sh
@@ -12,7 +12,8 @@ source "$FEISTY_MEOW_SCRIPTS/system/common_sysadmin.sh"
 # some convenient defaults for our current usage.
 
 if [ -z "$BASE_APPLICATION_PATH" ]; then
-  BASE_APPLICATION_PATH="$FEISTY_MEOW_APPS_DIR"
+  BASE_APPLICATION_PATH="$FEISTY_MEOW_SCAN_REPOS"
+#hmmm: take just first item!
 fi
 if [ -z "$STORAGE_SUFFIX" ]; then
   STORAGE_SUFFIX="/public"