X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsite_avenger%2Fshared_site_mgr.sh;h=cfc7c9a04848781f5d8d8b5284a315baeeb6f26e;hb=bf865883121e36604f3bf2dcf2638adb3b8b0423;hp=300ed3e708a4316f4cb310f2ca9fb8d8d6b6dd61;hpb=072156e50aea5cff0c813a9b61f38877311e39c8;p=feisty_meow.git

diff --git a/scripts/site_avenger/shared_site_mgr.sh b/scripts/site_avenger/shared_site_mgr.sh
index 300ed3e7..cfc7c9a0 100644
--- a/scripts/site_avenger/shared_site_mgr.sh
+++ b/scripts/site_avenger/shared_site_mgr.sh
@@ -236,6 +236,13 @@ function test_app_folder()
     exit_on_error "Making application directory when not already present"
   fi
 
+echo yo combo is $combo
+
+  if [ -d "$combo/$CHECKOUT_DIRNAME" ]; then
+    echo "Dropping expectation for intermediary checkout directory name."
+    unset CHECKOUT_DIRNAME
+  fi
+
   locate_config_file "$dir"
 }
 
@@ -276,7 +283,8 @@ function clear_orm_cache()
 
 # updates the revision control repository passed in.  this expects that the
 # repo will live in a folder called "checkout_dirname" under the app path,
-# which is the standard for our deployed sites.
+# which is the standard for deployed site avenger sites.  if that directory is
+# missing, then we assume a checkout of the top-level repository instead.
 # important: this also sets a global variable called site_store_path to the full
 # path of the application.
 function update_repo()
@@ -295,15 +303,26 @@ echo "$(date_stringer): $(var full_app_dir checkout_dirname repo_root repo_name)
   pushd "$full_app_dir" &>/dev/null
   exit_on_error "Switching to our app dir '$full_app_dir'"
 
-  local complete_path="$full_app_dir/$checkout_dirname"
+  local complete_path="$full_app_dir"
+#hmmm: below code problematic for when we want a new git clone to show up!
+  if [ ! -z "$checkout_dirname" -a -d "$full_app_dir/$checkout_dirname" ]; then
+    # make the full path using the non-empty checkout dir name.
+    complete_path+="/$checkout_dirname"
+  else
+    # using the additional path component failed, so we reset that to see if
+    # we can still proceed normally.
+    unset checkout_dirname
+  fi
+
+echo set complete_path: $complete_path
 
   # 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
+  if [ -d "$complete_path" ]; then
     # checkout directory exists, so let's check it.
-    pushd "$checkout_dirname" &>/dev/null
-    exit_on_error "Switching to our checkout directory: $checkout_dirname"
+    pushd "$complete_path" &>/dev/null
+    exit_on_error "Switching to directory for check out: $complete_path"
 
     # ask for repository name (without .git).
     if git rev-parse --git-dir > /dev/null 2>&1; then
@@ -314,7 +333,7 @@ echo "$(date_stringer): $(var full_app_dir checkout_dirname repo_root repo_name)
     # 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:"
-      echo "  $full_app_dir"
+      echo "  $complete_path"
       echo "This script cannot continue unless the git repository is valid."
       exit 1
     fi
@@ -323,19 +342,22 @@ echo "$(date_stringer): $(var full_app_dir checkout_dirname repo_root repo_name)
 
   if [ ! -z "$repo_found" ]; then
     # a repository was found, so update the version here and leave.
+    pushd "$complete_path" &>/dev/null
+    exit_on_error "Switching to directory for repo update: $complete_path"
     echo "Repository $repo_name exists.  Updating it."
-    rgetem
+    git pull --tags --all
     exit_on_error "Recursive checkout on: $complete_path"
+    popd &>/dev/null
   else
     # clone the repo since it wasn't found.
+    pushd "$complete_path/.." &>/dev/null
+    exit_on_error "Switching to parent directory prior to new clone: $complete_path/.."
     echo "Cloning repository $repo_name now."
     git clone "$repo_root/$repo_name.git" $checkout_dirname
     exit_on_error "Git clone of repository: $repo_name"
+    popd &>/dev/null
   fi
 
-#not doing this here since powerup uses this and has no sudo.
-  #fix_site_perms "$complete_path"
-
 #unused?
   # construct the full path to where the app will actually live.
   site_store_path="$complete_path"