X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsite_avenger%2Fsitepush.sh;h=c07d94539865423c5ac0cf89f6e175adab87e1ba;hb=05875de039cab91900b76995c8c459633060c428;hp=99a8cbefb9ce1d4460fd7ff5309d53b3d21b6cba;hpb=46da48836dd0d44a6f7a9129b516d5a5eb2fe223;p=feisty_meow.git

diff --git a/scripts/site_avenger/sitepush.sh b/scripts/site_avenger/sitepush.sh
index 99a8cbef..c07d9453 100644
--- a/scripts/site_avenger/sitepush.sh
+++ b/scripts/site_avenger/sitepush.sh
@@ -5,11 +5,7 @@
 
 # checks the chosen site into the online git repository.
 
-export WORKDIR="$( \cd "$(\dirname "$0")" && \pwd )"  # obtain the script's working directory.
-source "$WORKDIR/shared_site_mgr.sh"
-
-# get our defaults.
-source "$WORKDIR/site_avenger.config"
+export THISDIR="$( \cd "$(\dirname "$0")" && \pwd )"  # obtain the script's working directory.
 
 ############################
 
@@ -19,20 +15,23 @@ source "$WORKDIR/site_avenger.config"
 app_dirname="$1"; shift
 repo_name="$1"; shift
 
+source "$THISDIR/shared_site_mgr.sh"
+
 sep
 
-check_application_dir "$APPLICATION_DIR"
+check_apps_root "$app_dirname"
 
 # find proper webroot where the site will be initialized.
 if [ -z "$app_dirname" ]; then
   # no dir was passed, so guess it.
-  find_app_folder "$APPLICATION_DIR"
+  find_app_folder "$BASE_APPLICATION_PATH"
 else
-  test_app_folder "$APPLICATION_DIR" "$app_dirname"
+  test_app_folder "$BASE_APPLICATION_PATH" "$app_dirname"
 fi
+exit_on_error "finding and testing app folder"
 
 # where we expect to find our checkout folder underneath.
-full_app_dir="$APPLICATION_DIR/$app_dirname"
+full_app_dir="$BASE_APPLICATION_PATH/$app_dirname"
 
 # use our default values for the repository and theme if they're not provided.
 if [ -z "$repo_name" ]; then
@@ -44,7 +43,7 @@ sep
 
 # this should set the site_store_path variable if everything goes well.
 update_repo "$full_app_dir" "$CHECKOUT_DIR_NAME" "$DEFAULT_REPOSITORY_ROOT" "$repo_name"
-check_result "Updating the repository storage directory"
+exit_on_error "Updating the repository storage directory"
 
 sep
 
@@ -61,33 +60,3 @@ sep
 
 echo "Finished checking in the site at ${app_dirname}."
 
-
-
-
-
-
-echo bailing before deprecated code is run.; exit 0
-
-
-# see if there are any unmerged files, if so, do not try to push files
-if [[ `git ls-files -u` ]]; then
-  echo "Git: local changes!"
-  echo "Aborting. Please resolve manually and re-run this script"
-else
-  # http://stackoverflow.com/questions/5143795/how-can-i-check-in-a-bash-script-if-my-local-git-repo-has-changes
-  # see if there are any new files that need pushing (status will show new files)
-  if [[ `git status --porcelain` ]]; then
-    # changes
-    git add . -A
-    git commit -m "SERVER. Adding user uploaded files. [via sitepush]"
-    git push origin master
-    echo "Git: changes pushed to [master]"
-  else
-    # no changes
-    echo "Git: nothing to push. [master] up to date."
-  fi
-fi
-
-####
-
-