X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsite_avenger%2Fsiteup.sh;h=d1b183d758aea5613037dc3db5e3ddd79527757a;hb=43099b0a5606877a692b484b58c807cf8ea20bd7;hp=e2a70593334ebffa4a30416fa5f377eedab1e567;hpb=df7e2dd0c79566650f4104496679c43a6a059424;p=feisty_meow.git diff --git a/scripts/site_avenger/siteup.sh b/scripts/site_avenger/siteup.sh index e2a70593..d1b183d7 100644 --- a/scripts/site_avenger/siteup.sh +++ b/scripts/site_avenger/siteup.sh @@ -5,7 +5,7 @@ # updates a site avenger app. -export WORKDIR="$( \cd "$(\dirname "$0")" && \pwd )" # obtain the script's working directory. +export THISDIR="$( \cd "$(\dirname "$0")" && \pwd )" # obtain the script's working directory. ############################ @@ -15,11 +15,11 @@ export WORKDIR="$( \cd "$(\dirname "$0")" && \pwd )" # obtain the script's work app_dirname="$1"; shift repo_name="$1"; shift -source "$WORKDIR/shared_site_mgr.sh" +source "$THISDIR/shared_site_mgr.sh" sep -check_apps_root "$BASE_APPLICATION_PATH" +check_apps_root "$app_dirname" # find proper webroot where the site will be initialized. if [ -z "$app_dirname" ]; then @@ -28,7 +28,7 @@ if [ -z "$app_dirname" ]; then else test_app_folder "$BASE_APPLICATION_PATH" "$app_dirname" fi -test_or_die "finding and testing app folder" +exit_on_error "finding and testing app folder" # where we expect to find our checkout folder underneath. full_app_dir="$BASE_APPLICATION_PATH/$app_dirname" @@ -43,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" -test_or_die "Updating the repository storage directory" +exit_on_error "Updating the repository storage directory" ####