projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new fortune
[feisty_meow.git]
/
scripts
/
site_avenger
/
powerup.sh
diff --git
a/scripts/site_avenger/powerup.sh
b/scripts/site_avenger/powerup.sh
index eccb0b6aefd33f6ace6af024be3390c88fcc1843..de9310c10b3b9d067e9a017b59b097b97ea088b7 100644
(file)
--- a/
scripts/site_avenger/powerup.sh
+++ b/
scripts/site_avenger/powerup.sh
@@
-20,8
+20,8
@@
# It will have to be told the theme name, but will assume it's 'Turtle' to
# start with. The concept of the theme comes from cakephp.
# It will have to be told the theme name, but will assume it's 'Turtle' to
# start with. The concept of the theme comes from cakephp.
-export
WORK
DIR="$( \cd "$(\dirname "$0")" && \pwd )" # obtain the script's working directory.
-export FEISTY_MEOW_APEX="$( \cd "$
WORK
DIR/../.." && \pwd )"
+export
THIS
DIR="$( \cd "$(\dirname "$0")" && \pwd )" # obtain the script's working directory.
+export FEISTY_MEOW_APEX="$( \cd "$
THIS
DIR/../.." && \pwd )"
source "$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh"
source "$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh"
@@
-55,11
+55,15
@@
if [ "$app_dirname" == "-help" -o "$app_dirname" == "--help" ]; then
print_instructions
fi
print_instructions
fi
-source "$
WORK
DIR/shared_site_mgr.sh"
+source "$
THIS
DIR/shared_site_mgr.sh"
sep
sep
-check_apps_root "$BASE_APPLICATION_PATH"
+check_apps_root "$app_dirname"
+
+echo fixing some things here...
+echo "apps root is now '$BASE_APPLICATION_PATH'"
+echo " => this should be just above the app dir name if we got no parms!"
# 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
@@
-68,7
+72,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
-
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"
# where we expect to find our checkout folder underneath.
full_app_dir="$BASE_APPLICATION_PATH/$app_dirname"
@@
-91,17
+95,16
@@
echo "Repository: $repo_name"
echo "Theme name: $theme_name"
sep
echo "Theme name: $theme_name"
sep
-echo in powerup before update repo with:
-var CHECKOUT_DIR_NAME DEFAULT_REPOSITORY_ROOT
+log_feisty_meow_event "in powerup before update repo with: $(var CHECKOUT_DIR_NAME DEFAULT_REPOSITORY_ROOT)"
# 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"
# 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"
# update the site to load dependencies.
sep
composer_repuff "$site_store_path"
# update the site to load dependencies.
sep
composer_repuff "$site_store_path"
-
test_or_die
"Installing site dependencies with composer"
+
exit_on_error
"Installing site dependencies with composer"
# set up the symbolic links needed to achieve siteliness.
sep
# set up the symbolic links needed to achieve siteliness.
sep