new fortune, plus site avenger mods

[feisty_meow.git] / scripts / site_avenger / shared_site_mgr.sh

diff --git a/scripts/site_avenger/shared_site_mgr.sh b/scripts/site_avenger/shared_site_mgr.sh
index 50ca50da391e4526aa4b830d124a97e33ee5b9cd..6f731e6937a3158e83e4b994306ea985e366a2cb 100644 (file)
--- a/scripts/site_avenger/shared_site_mgr.sh
+++ b/scripts/site_avenger/shared_site_mgr.sh
@@ -142,23 +142,19 @@ function fix_site_perms()
   local site_dir="$app_dir/$CHECKOUT_DIR_NAME"
 
   if [ -f "$site_dir/bin/cake" ]; then
-    chmod -R a+rx "$site_dir/bin/cake"
+    sudo chmod -R a+rx "$site_dir/bin/cake"
     test_or_die "Enabling execute bit on cake binary"
   fi
 
-  if [ ! -d "$site_dir/logs" ]; then
-    mkdir "$site_dir/logs"
-    test_or_die "Creating logs directory"
+  if [ -d "$site_dir/logs" ]; then
+    sudo chmod -R g+w "$site_dir/logs"
+    test_or_die "Enabling group write on site's Logs directory"
   fi
-  chmod -R g+w "$site_dir/logs"
-  test_or_die "Enabling group write on site's Logs directory"
 
-  if [ ! -d "$site_dir/tmp" ]; then
-    mkdir "$site_dir/tmp"
-    test_or_die "Creating tmp directory"
+  if [ -d "$site_dir/tmp" ]; then
+    sudo chmod -R g+w "$site_dir/tmp"
+    test_or_die "Enabling group write on site's tmp directory"
   fi
-  chmod -R g+w "$site_dir/tmp"
-  test_or_die "Enabling group write on site's tmp directory"
 }
 
 # tosses out any cached object data that originated from the database.
@@ -372,9 +368,9 @@ function fix_appdir_ownership()
   # go with the default user running the script.
   user_name="$USER"
   if [ ! -z "$user_name" -a "$user_name" != "root" ]; then
-    echo "Chowning the apps folder to be owned by: $user_name"
+    echo "Chowning the app folder to be owned by: $user_name"
 #hmmm: have to hope for now for standard group named after user 
-    chown -R "$user_name:$user_name" "$combo"
+    sudo chown -R "$user_name:$user_name" "$combo"
     test_or_die "Chowning $combo to be owned by $user_name"
   else
     echo "user name failed checks for chowning, was found as '$user_name'"
@@ -385,4 +381,27 @@ function fix_appdir_ownership()
   fix_site_perms "$combo"
 }
 
+# Jumps to an application directory given the app name.  If no app name is
+# given, it will show a menu to pick the app.
+function switch_to()
+{
+  # check for parameters.
+  app_dirname="$1"; shift
+
+  check_application_dir "$BASE_APPLICATION_PATH"
+
+  # find proper webroot where the site will be initialized.
+  if [ -z "$app_dirname" ]; then
+    # no dir was passed, so guess it.
+    find_app_folder "$BASE_APPLICATION_PATH"
+  else
+    test_app_folder "$BASE_APPLICATION_PATH" "$app_dirname"
+  fi
+
+  # where we expect to find our checkout folder underneath.
+  full_app_dir="$BASE_APPLICATION_PATH/$app_dirname"
+
+  cd $full_app_dir/$CHECKOUT_DIR_NAME
+  pwd
+}