From: Chris Koeritz <fred@gruntose.com>
Date: Mon, 13 Nov 2017 02:23:14 +0000 (-0500)
Subject: standup finally working
X-Git-Tag: 2.140.98^2~2^2~10
X-Git-Url: https://feistymeow.org/gitweb/?p=feisty_meow.git;a=commitdiff_plain;h=51d8b4e834cb9363728cd73f15162304e2f15061

standup finally working

lots of debug noise to clean though
also more testing
---

diff --git a/scripts/site_avenger/config/default.app b/scripts/site_avenger/config/default.app
index 2514ddf5..e6f9cf30 100644
--- a/scripts/site_avenger/config/default.app
+++ b/scripts/site_avenger/config/default.app
@@ -32,7 +32,7 @@ export DOMAIN_NAME="${app_dirname}.vm"
 
 echo domain name was computed as $DOMAIN_NAME
 
-export REPO_NAME="${app_dirname}.git"
+export REPO_NAME="${app_dirname}"
 
 echo repo name was computed as $REPO_NAME
 
diff --git a/scripts/site_avenger/config/mapsdemo.app b/scripts/site_avenger/config/mapsdemo.app
index a2bca519..ab89231b 100644
--- a/scripts/site_avenger/config/mapsdemo.app
+++ b/scripts/site_avenger/config/mapsdemo.app
@@ -5,6 +5,6 @@
 
 source "$WORKDIR/config/default.app"
 
-DOMAIN_NAME="${APPLICATION_NAME}.cakelampvm.com"
+export DOMAIN_NAME="${APPLICATION_NAME}.cakelampvm.com"
 
 
diff --git a/scripts/site_avenger/shared_site_mgr.sh b/scripts/site_avenger/shared_site_mgr.sh
index b30ca82d..3c03ccbe 100644
--- a/scripts/site_avenger/shared_site_mgr.sh
+++ b/scripts/site_avenger/shared_site_mgr.sh
@@ -167,6 +167,9 @@ function update_repo()
   local repo_root="$1"; shift
   local repo_name="$1"; shift
 
+echo here are parms in update repo:
+var full_app_dir checkout_dirname repo_root repo_name
+
   # forget any prior value, since we are going to validate the path.
   unset site_store_path
 
@@ -175,10 +178,12 @@ function update_repo()
 
   local complete_path="$full_app_dir/$checkout_dirname"
 
+echo A
   # see if the checkout directory exits.  the repo_found variable is set to
   # non-empty if we find it and it's a valid git repo.
   repo_found=
   if [ -d "$checkout_dirname" ]; then
+echo B
     # checkout directory exists, so let's check it.
     pushd "$checkout_dirname" &>/dev/null
     test_or_die "Switching to our checkout directory: $checkout_dirname"
@@ -189,6 +194,7 @@ function update_repo()
       repo_found=yes
     fi
  
+echo C
     # we don't consider the state of having the dir exist but the repo be wrong as good.
     if [ -z "$repo_found" ]; then
       echo "There is a problem; this folder is not a valid repository:"
@@ -199,18 +205,22 @@ function update_repo()
     popd &>/dev/null
   fi
 
+echo D
   if [ ! -z "$repo_found" ]; then
     # a repository was found, so update the version here and leave.
+echo E
     echo "Repository $repo_name exists.  Updating it."
     rgetem
     test_or_die "Recursive checkout on: $complete_path"
   else
+echo F
     # clone the repo since it wasn't found.
     echo "Cloning repository $repo_name now."
     git clone "$repo_root/$repo_name.git" $checkout_dirname
     test_or_die "Git clone of repository: $repo_name"
   fi
 
+echo G
   fix_site_perms "$complete_path"
 
   # construct the full path to where the app will actually live.
diff --git a/scripts/site_avenger/standup.sh b/scripts/site_avenger/standup.sh
index d4beffe0..bb9d0700 100644
--- a/scripts/site_avenger/standup.sh
+++ b/scripts/site_avenger/standup.sh
@@ -66,6 +66,8 @@ else
   test_app_folder "$APPLICATION_DIR" "$app_dirname"
 fi
 
+echo "!! domain being added is: $DOMAIN_NAME"
+
 add_domain "$DOMAIN_NAME"
 test_or_die "Setting up domain: $DOMAIN_NAME"