X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsite_avenger%2Fshared_site_mgr.sh;h=ceefcc5b91674ae02d1c6897be33d0a50c625e75;hb=4449adcb354c8617994a11ee1d62f1f642764fa5;hp=3bd96658aa237c626a7c707fee760570aa666143;hpb=328a5c53f1329b16ad86f7bcdd8de3d843637419;p=feisty_meow.git

diff --git a/scripts/site_avenger/shared_site_mgr.sh b/scripts/site_avenger/shared_site_mgr.sh
index 3bd96658..ceefcc5b 100644
--- a/scripts/site_avenger/shared_site_mgr.sh
+++ b/scripts/site_avenger/shared_site_mgr.sh
@@ -17,7 +17,7 @@ function check_application_dir()
   if [ ! -d "$appdir" ]; then
     echo "Creating the apps directory: $appdir"
     mkdir "$appdir"
-    check_result "Making apps directory when not already present"
+    test_or_fail "Making apps directory when not already present"
   fi
 }
 
@@ -47,7 +47,7 @@ function find_app_folder()
     exit 1
   elif [ $numdirs -eq 1 ]; then
     app_dirname="$(basename $(find "$appsdir" -mindepth 1 -maxdepth 1 -type d) )"
-    check_result "Guessing application folder"
+    test_or_fail "Guessing application folder"
   else
     # if more than one folder, force user to choose.
     # Reference: https://askubuntu.com/questions/1705/how-can-i-create-a-select-menu-in-a-shell-script
@@ -68,7 +68,7 @@ function find_app_folder()
     PS3="$holdps3"
   fi
   test_app_folder "$appsdir" "$app_dirname"
-  check_result "Testing application folder: $app_dirname"
+  test_or_fail "Testing application folder: $app_dirname"
 
   echo "Application folder is: $app_dirname"
 }
@@ -84,7 +84,7 @@ function test_app_folder()
   if [ ! -d "$combo" ]; then
     echo "Creating app directory: $combo"
     mkdir "$combo"
-    check_result "Making application directory when not already present"
+    test_or_fail "Making application directory when not already present"
   fi
 }
 
@@ -95,17 +95,17 @@ function fix_site_perms()
 
   if [ -f "$site_dir/bin/cake" ]; then
     chmod -R a+rx "$site_dir/bin/cake"
-    check_result "Enabling execute bit on cake binary"
+    test_or_fail "Enabling execute bit on cake binary"
   fi
 
   if [ -d "$site_dir/logs" ]; then
     chmod -R g+w "$site_dir/logs"
-    check_result "Enabling group write on site's Logs directory"
+    test_or_fail "Enabling group write on site's Logs directory"
   fi
 
   if [ -d "$site_dir/tmp" ]; then
     chmod -R g+w "$site_dir/tmp"
-    check_result "Enabling group write on site's tmp directory"
+    test_or_fail "Enabling group write on site's tmp directory"
   fi
 }
 
@@ -117,7 +117,7 @@ function clear_orm_cache()
   if [ -f "$site_dir/bin/cake" ]; then
     # flush any cached objects from db.
     "$site_dir/bin/cake" orm_cache clear
-    check_result "Clearing ORM cache"
+    test_or_fail "Clearing ORM cache"
   fi
 }
 
@@ -137,7 +137,7 @@ function update_repo()
   unset site_store_path
 
   pushd "$full_app_dir" &>/dev/null
-  check_result "Switching to our app dir '$full_app_dir'"
+  test_or_fail "Switching to our app dir '$full_app_dir'"
 
   local complete_path="$full_app_dir/$checkout_dirname"
 
@@ -147,7 +147,7 @@ function update_repo()
   if [ -d "$checkout_dirname" ]; then
     # checkout directory exists, so let's check it.
     pushd "$checkout_dirname" &>/dev/null
-    check_result "Switching to our checkout directory: $checkout_dirname"
+    test_or_fail "Switching to our checkout directory: $checkout_dirname"
 
     # ask for repository name (without .git).
     if git rev-parse --git-dir > /dev/null 2>&1; then
@@ -169,12 +169,12 @@ function update_repo()
     # a repository was found, so update the version here and leave.
     echo "Repository $repo_name exists.  Updating it."
     rgetem
-    check_result "Recursive checkout on: $complete_path"
+    test_or_fail "Recursive checkout on: $complete_path"
   else
     # clone the repo since it wasn't found.
     echo "Cloning repository $repo_name now."
     git clone "$repo_root/$repo_name.git" $checkout_dirname
-    check_result "Git clone of repository: $repo_name"
+    test_or_fail "Git clone of repository: $repo_name"
   fi
 
   fix_site_perms "$complete_path"
@@ -193,12 +193,12 @@ function composer_repuff()
   local site_store_path="$1"; shift
 
   pushd "$site_store_path" &>/dev/null
-  check_result "Switching to our app dir '$site_store_path'"
+  test_or_fail "Switching to our app dir '$site_store_path'"
 
   echo "Updating site with composer..."
 
   composer -n install
-  check_result "Composer installation step on '$site_store_path'."
+  test_or_fail "Composer installation step on '$site_store_path'."
   echo "Site updated."
 
 #hmmm: argh global
@@ -232,13 +232,13 @@ function create_site_links()
 
   # jump into the site path so we can start making relative links.
   pushd "$site_store_path" &>/dev/null
-  check_result "Switching to our app dir '$site_store_path'"
+  test_or_fail "Switching to our app dir '$site_store_path'"
 
   pushd webroot &>/dev/null
 
   # remove all symlinks that might plague us.
   find . -maxdepth 1 -type l -exec rm -f {} ';'
-  check_result "Cleaning out links in webroot"
+  test_or_fail "Cleaning out links in webroot"
 
   # link in the avcore plugin.
   make_safe_link "../vendor/siteavenger/avcore/webroot" avcore
@@ -265,18 +265,18 @@ function create_site_links()
   if [ -L public ]; then
     # public is a symlink.
     \rm public
-    check_result "Removing public directory symlink"
+    test_or_fail "Removing public directory symlink"
   elif [ -d public ]; then
     # public is a folder with default files.
 #hmmm: is that safe?
     \rm -rf public
-    check_result "Removing public directory and contents"
+    test_or_fail "Removing public directory and contents"
   fi
 
   # create the main 'public' symlink
 #hmmm: argh global
   make_safe_link $CHECKOUT_DIR_NAME/webroot public
-  check_result "Creating link to webroot called 'public'"
+  test_or_fail "Creating link to webroot called 'public'"
 
 #hmmm: public/$themelower/im will be created automatically by system user with appropriate permissions