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 'master' 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 6462dea20f0faf3e2a8948a3adbe59ebb00fe3e0..2ae511cbb8eb50148b9efd2841ee0bddf088463e 100644
(file)
--- a/
scripts/site_avenger/avcoreup.sh
+++ b/
scripts/site_avenger/avcoreup.sh
@@
-7,8
+7,6
@@
export WORKDIR="$( \cd "$(\dirname "$0")" && \pwd )" # obtain the script's working directory.
export WORKDIR="$( \cd "$(\dirname "$0")" && \pwd )" # obtain the script's working directory.
-source "$WORKDIR/shared_site_mgr.sh"
-
############################
# main body of script.
############################
# main body of script.
@@
-16,20
+14,22
@@
source "$WORKDIR/shared_site_mgr.sh"
# check for parameters.
app_dirname="$1"; shift
# check for parameters.
app_dirname="$1"; shift
+source "$WORKDIR/shared_site_mgr.sh"
+
sep
sep
-check_application_dir "$
APPLICATION_DIR
"
+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 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
else
- test_app_folder "$
APPLICATION_DIR
" "$app_dirname"
+ test_app_folder "$
BASE_APPLICATION_PATH
" "$app_dirname"
fi
# where we expect to find our checkout folder underneath.
fi
# where we expect to find our checkout folder underneath.
-full_app_dir="$
APPLICATION_DIR
/$app_dirname"
+full_app_dir="$
BASE_APPLICATION_PATH
/$app_dirname"
# simplistic approach here; just go to the folder and pull the changes.
# simplistic approach here; just go to the folder and pull the changes.