revised usage of apps dir

now should find all projects under ~/apps, not just site avenger ones.
also usage of word apps has been cleaned up where it can be.

diff --git a/scripts/clam/target_runner.sh b/scripts/clam/target_runner.sh
index d7b1ed338184f9ac492a6ecec001aaf7071b8303..553463f06007f5fb150028a0cdb89af173d4b88f 100755 (executable)
--- a/scripts/clam/target_runner.sh
+++ b/scripts/clam/target_runner.sh
@@ -24,7 +24,7 @@ if [ ! -z "${RUN_TARGETS}" -a ! -z "${RUN_ALL_TESTS}" ]; then
     for program_name in ${RUN_TARGETS}; do
       base=$(basename $program_name);
       if [ "$OP_SYSTEM" == "WIN32" ]; then
-        # extra step to force win32 apps to stay held in our grip,
+        # extra step to force win32 applications to stay held in our grip,
         # since they will float off and appear to have stopped when
         # run by cygwin.  but by grabbing the i/o stream, we know it's
         # running until it's done.

diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh
index 494c43c55aa5356932891fb6e77384f222946211..f708fe852778792cdb1b022d345bfb0f936b7b67 100644 (file)
--- a/scripts/core/functions.sh
+++ b/scripts/core/functions.sh
@@ -780,8 +780,8 @@ return 0
   # count the number of sub-directories in a directory and echo the result.
   function count_directories()
   {
-    local appsdir="$1"; shift
-    numdirs="$(find "$appsdir" -mindepth 1 -maxdepth 1 -type d | wc -l)"
+    local subbydir="$1"; shift
+    numdirs="$(find "$subbydir" -mindepth 1 -maxdepth 1 -type d | wc -l)"
     echo $numdirs
   }
 

diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index fa4bdca9e4ce85f3b769ca712ee4386e0165fec4..158a76b5798434bc164bd231b4d547f550c88453 100644 (file)
--- a/scripts/core/variables.sh
+++ b/scripts/core/variables.sh
@@ -218,9 +218,12 @@ define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org
   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 apps folder.
+  # add in any site avenger applications that are in the applications folder.
   if [ -d "$HOME/apps" ]; then
-    # back up all the apps.
+    # general search for normal folders at top level 
+    REPOSITORY_LIST+="$(find "$HOME/apps" -maxdepth 2 -mindepth 2 -iname ".git" -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) "
   fi
   

diff --git a/scripts/customize/fred/java_profile.sh b/scripts/customize/fred/java_profile.sh
index ba26b72ae5f717f844d476558574992b79c92326..99027e6ff482120151f667743a8fafc372601611 100644 (file)
--- a/scripts/customize/fred/java_profile.sh
+++ b/scripts/customize/fred/java_profile.sh
@@ -80,7 +80,7 @@ if [ ! -d "$ECLIPSE_DIR" ]; then
   ECLIPSE_DIR=$HOME/eclipse
 fi
 if [ ! -d "$ECLIPSE_DIR" ]; then
-  ECLIPSE_DIR=$HOME/apps/eclipse
+  ECLIPSE_DIR=/usr/local/fred/eclipse
 fi
 if [ ! -d "$ECLIPSE_DIR" ]; then
   ECLIPSE_DIR="c:/tools/eclipse"

diff --git a/scripts/generator/build_variables.sh b/scripts/generator/build_variables.sh
index c8a4c3ec637ba19c1fecbbb8e0aa2c1d5b89f1e1..eb3a56605c3c60ffe6d95567b14060b91649c699 100644 (file)
--- a/scripts/generator/build_variables.sh
+++ b/scripts/generator/build_variables.sh
@@ -180,11 +180,11 @@ if [ -z "$got_bad" ]; then
   # where we store the binaries used for building the rest of the code base.
   export CLAM_BINARIES="$RUNTIME_PATH/clam_bin"
     # the final destination for the new binaries which provide the hoople
-    # build with all the apps it needs to get going.
+    # build with all the applications it needs to get going.
   export TARGETS_STORE="$RUNTIME_PATH/binaries"
     # targets directory is meaningful to clam, which will use it for output.
   export INTERMEDIATE_STORE="$TARGETS_STORE"
-    # where we are building the apps before they get promoted.
+    # where we are building the applications before they get promoted.
 
 #hmmm: could allow override on this if already set.
   # calculate which build ini file to use.

diff --git a/scripts/generator/produce_feisty_meow.sh b/scripts/generator/produce_feisty_meow.sh
index 5b3135d03ee8dc536e3c5f7c4697eec52c70cc49..d9c832526378f8a488a551442e309e70230a9457 100644 (file)
--- a/scripts/generator/produce_feisty_meow.sh
+++ b/scripts/generator/produce_feisty_meow.sh
@@ -94,7 +94,7 @@ export BOOT_STRAPPING=true
 declare -a BUILD_DEFAULTS=( "BOOT_STRAPPING=t" "OPTIMIZE=t" "REBUILD=t" "DEBUG=" )
   # bootstrapping is always turned on for this particular script.
   # we also always optimize these builds and turn off the debug flag.
-  # rebuild ensures that the new apps are made fresh: "REBUILD=t"
+  # rebuild ensures that the new applications are made fresh: "REBUILD=t"
   #   it can be turned off when the build bootstrapper is being tested.
   # noisy can be added to spew lots of text: "NOISY=t"
   #   this can help with compilation issues by showing all the flags.
@@ -203,7 +203,7 @@ if [ ! -f "$CLAM_BINARIES/makedep$EXE_ENDING" ]; then
   popd &>/dev/null
 fi
 
-# rebuild the version tools and other support apps.
+# rebuild the version tools and other support applications.
 if [ ! -f "$CLAM_BINARIES/value_tagger$EXE_ENDING" \
     -o ! -f "$CLAM_BINARIES/version_stamper$EXE_ENDING" \
     -o ! -f "$CLAM_BINARIES/vsts_version_fixer$EXE_ENDING" \
@@ -212,7 +212,7 @@ if [ ! -f "$CLAM_BINARIES/value_tagger$EXE_ENDING" \
   make_code pre_compilation OMIT_VERSIONS=t
   make_code OMIT_VERSIONS=t
 
-#hmmm: really this should check all the expected apps.
+#hmmm: really this should check all the expected applications.
 #      nice to just have an array of the things built by this guy.
   if [ ! -f "$INTERMEDIATE_STORE/version_stamper$EXE_ENDING" ]; then
     echo ""

diff --git a/scripts/wine/replace_wine_links.sh b/scripts/wine/replace_wine_links.sh
index 04765f380b17514d153c19f89516967faab765bd..a40f2877901a2e7f7f4eda4bba0a53750e9899a2 100644 (file)
--- a/scripts/wine/replace_wine_links.sh
+++ b/scripts/wine/replace_wine_links.sh
@@ -2,7 +2,7 @@
 
 # fixes the links that wine makes to our home folder under linux.  that's a really bad
 # practice that exposes all one's private files to the wine subsystem.  dumb.
-# instead, this replaces those links to a local folder with things that the wine apps
+# instead, this replaces those links to a local folder with things that the wine applications
 # can't pooch up too much.  must be used within a wine user directory.  for example,
 # i fix my directory '~/.PlayOnLinux/wineprefix/Steam/drive_c/users/fred' with this.