X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsite_avenger%2Fpowerup.sh;h=998fcad57b4aae9517737ab6ea75bacb654b186e;hb=58ef1a07e683cb62296f090e966f97621cecdb7f;hp=74982616718af62e7bbed3a278ad0b3e60196d0c;hpb=46da48836dd0d44a6f7a9129b516d5a5eb2fe223;p=feisty_meow.git

diff --git a/scripts/site_avenger/powerup.sh b/scripts/site_avenger/powerup.sh
index 74982616..998fcad5 100644
--- a/scripts/site_avenger/powerup.sh
+++ b/scripts/site_avenger/powerup.sh
@@ -5,8 +5,6 @@
 
 # This script "powers up" a cakephp site by running the database migrations,
 # cleaning out the ORM cache, and fixing file permissions.
-# Note that the mysql database must already exist and allow permissions to
-# the configured username/password in config/app.php.
 # This script is currently highly specific to site avenger.
 
 # General Info:
@@ -23,10 +21,22 @@
 # start with.  The concept of the theme comes from cakephp.
 
 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"
+############################
+
+function print_instructions()
+{
+  echo
+  echo "$(basename $0 .sh) [app dirname] [repository] [theme name]"
+  echo
+  echo "All parameters are optional, and intelligent guesses for them will be made."
+  echo
+  echo "app dirname: The folder where the app will be stored."
+  echo "repository: The name of the git repository (short version, no URL)."
+  echo "theme name: The name to use for the cakephp theme."
+  echo
+  exit 0
+}
 
 ############################
 
@@ -37,6 +47,12 @@ app_dirname="$1"; shift
 repo_name="$1"; shift
 theme_name="$1"; shift
 
+if [ "$app_dirname" == "-help" -o "$app_dirname" == "--help" ]; then
+  print_instructions
+fi
+
+source "$WORKDIR/shared_site_mgr.sh"
+
 sep
 
 check_application_dir "$APPLICATION_DIR"
@@ -66,12 +82,12 @@ 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"
+test_or_die "Updating the repository storage directory"
 
 # update the site to load dependencies.
 sep
 composer_repuff "$site_store_path"
-check_result "Installing site dependencies with composer"
+test_or_die "Installing site dependencies with composer"
 
 # set up the symbolic links needed to achieve siteliness.
 sep