projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'main' of feistymeow.org:feisty_meow
[feisty_meow.git]
/
scripts
/
site_avenger
/
avcoreup.sh
diff --git
a/scripts/site_avenger/avcoreup.sh
b/scripts/site_avenger/avcoreup.sh
index 2ae511cbb8eb50148b9efd2841ee0bddf088463e..437e5134ded32cfc9dfd4e5c870a8a5daa547293 100644
(file)
--- a/
scripts/site_avenger/avcoreup.sh
+++ b/
scripts/site_avenger/avcoreup.sh
@@
-5,7
+5,7
@@
# updates just the site avenger core portion of an app.
# updates just the site avenger core portion of an app.
-export
WORK
DIR="$( \cd "$(\dirname "$0")" && \pwd )" # obtain the script's working directory.
+export
THIS
DIR="$( \cd "$(\dirname "$0")" && \pwd )" # obtain the script's working directory.
############################
############################
@@
-14,11
+14,11
@@
export WORKDIR="$( \cd "$(\dirname "$0")" && \pwd )" # obtain the script's work
# check for parameters.
app_dirname="$1"; shift
# check for parameters.
app_dirname="$1"; shift
-source "$
WORK
DIR/shared_site_mgr.sh"
+source "$
THIS
DIR/shared_site_mgr.sh"
sep
sep
-check_app
lication_dir "$BASE_APPLICATION_PATH
"
+check_app
s_root "$app_dirname
"
# find proper webroot where the site will be initialized.
if [ -z "$app_dirname" ]; then
# find proper webroot where the site will be initialized.
if [ -z "$app_dirname" ]; then
@@
-27,6
+27,7
@@
if [ -z "$app_dirname" ]; then
else
test_app_folder "$BASE_APPLICATION_PATH" "$app_dirname"
fi
else
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="$BASE_APPLICATION_PATH/$app_dirname"
# where we expect to find our checkout folder underneath.
full_app_dir="$BASE_APPLICATION_PATH/$app_dirname"
@@
-34,16
+35,16
@@
full_app_dir="$BASE_APPLICATION_PATH/$app_dirname"
# simplistic approach here; just go to the folder and pull the changes.
pushd "$full_app_dir" &>/dev/null
# simplistic approach here; just go to the folder and pull the changes.
pushd "$full_app_dir" &>/dev/null
-
test_or_die
"Changing to app path '$full_app_dir'"
+
exit_on_error
"Changing to app path '$full_app_dir'"
-dir="
avenger5
/vendor/siteavenger/avcore"
+dir="
$CHECKOUT_DIR_NAME
/vendor/siteavenger/avcore"
if [ ! -d $dir ]; then
echo "The application doesn't seem to use avcore: $full_app_dir"
else
pushd "$dir" &>/dev/null
git pull
if [ ! -d $dir ]; then
echo "The application doesn't seem to use avcore: $full_app_dir"
else
pushd "$dir" &>/dev/null
git pull
-
test_or_die
"Pulling git repo for avcore under '$full_app_dir'"
+
exit_on_error
"Pulling git repo for avcore under '$full_app_dir'"
echo "Finished updating the avcore portion of site in ${app_dirname}."
echo "Finished updating the avcore portion of site in ${app_dirname}."