Merge branch 'dev' of feistymeow.org:feisty_meow into dev

diff --git a/scripts/customize/fred/scripts/cakelampvm/revamp_web_permissions.sh b/scripts/customize/fred/scripts/cakelampvm/revamp_web_permissions.sh
index 29483051a3cd478dea621286722120576d66f2cb..837cf3c7477294525beba78c5f32e63267f1faf1 100644 (file)
--- a/scripts/customize/fred/scripts/cakelampvm/revamp_web_permissions.sh
+++ b/scripts/customize/fred/scripts/cakelampvm/revamp_web_permissions.sh
@@ -18,23 +18,25 @@ source "$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh"
 
 ##############
 
-# make sure we have the appropriate access on a few key folders.
-normal_perm /var/www
+# fix up the main web storage.
+chown -R www-data:www-data /var/www 
+group_perm /var/www 
 
 ##############
 
-# change the owner for the web roots to the apache user, www-data.
-chown -R www-data:www-data /var/www
-
-# put a couple specific ownerships into play so the appropriate user has full access.
-chown -R developer:developer /home/developer /opt/feistymeow.org /etc/apache2 /etc/bind
-
-chown -R fred:fred /home/fred /home/archives/stuffing 
+# set up access on some important folders for the developer user.
+chown -R developer:developer /home/developer /opt/feistymeow.org /etc/apache2 /etc/bind 
+normal_perm /opt/feistymeow.org 
+# don't want others trying to check feisty meow in.
+harsh_perm /opt/feistymeow.org/feisty_meow/.git
+harsh_perm /home/developer/.ssh
+group_perm /etc/apache2 /etc/bind 
 
 ##############
 
-# these directories will be given group permissons that enable web server access.
-group_perm /var/www /etc/apache2 /etc/bind
+# fix perms for fred user.
+chown -R fred:fred /home/fred /home/archives/stuffing 
+harsh_perm /home/fred/.ssh
 
 ##############
 

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index 7656dc1003c453617fae7b9f3ae0b326da8d9e1a..08a9a07c1f0880bb33b07e1eb7cac00fd56f8ad8 100644 (file)
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -266,6 +266,11 @@ function check_branch_state()
 {
   local branch="$1"; shift
 
+  if [ -z "$branch" ]; then
+    echo "No branch was passed to check branch state."
+    return 1
+  fi
+
   local to_return=120  # unknown issue.
 
   local local_branch=$(git rev-parse @)
@@ -300,16 +305,18 @@ function do_careful_git_update()
     return 0
   fi
 
+  local this_branch="$(my_branch_name)"
+
+  state=$(check_branch_state "$this_branch")
+  echo "=> branch '$this_branch' state prior to remote update is: $state"
+
   # first update all our remote branches to their current state from the repos.
   git remote update | $TO_SPLITTER
   promote_pipe_return 0
   test_or_die "git remote update"
 
-  local this_branch="$(my_branch_name)"
-#appears to be useless; reports no changes when we need to know about remote changes that do exist:
-#hmmm: trying it out again now that things are better elsewhere.  let's see what it says.
   state=$(check_branch_state "$this_branch")
-  echo "=> branch '$this_branch' state is: $state"
+  echo "=> branch '$this_branch' state after remote update is: $state"
 
   # this code is now doing what i have to do when i repair the repo.  and it seems to be good so far.
   local branch_list=$(all_branch_names)
@@ -328,6 +335,8 @@ function do_careful_git_update()
       # we are pretty sure the remote branch does exist.
       git pull --no-ff origin "$bran" | $TO_SPLITTER
       promote_pipe_return 0
+
+      echo "=> branch '$bran' state after pull is: $state"
     fi
     test_or_die "git pull of remote branch: $bran"
   done