updated to add new FEISTY_MEOW_APPS_DIR

[feisty_meow.git] / scripts / system / add_apache_site.sh

diff --git a/scripts/system/add_apache_site.sh b/scripts/system/add_apache_site.sh
index a9a379fd748ad3a5901e8176471ed1d108685181..ad94e2f993e8d712902740839c2ad5d9f4114115 100644 (file)
--- a/scripts/system/add_apache_site.sh
+++ b/scripts/system/add_apache_site.sh
@@ -3,8 +3,8 @@
 # creates a new apache website for a specified domain.
 
 # auto-find the scripts, since we might want to run this as sudo.
-export WORKDIR="$( \cd "$(\dirname "$0")" && /bin/pwd )"  # obtain the script's working directory.
-export FEISTY_MEOW_APEX="$( \cd "$WORKDIR/../.." && \pwd )"
+export THISDIR="$( \cd "$(\dirname "$0")" && /bin/pwd )"  # obtain the script's working directory.
+export FEISTY_MEOW_APEX="$( \cd "$THISDIR/../.." && \pwd )"
 
 source "$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh"
 source "$FEISTY_MEOW_SCRIPTS/system/common_sysadmin.sh"
@@ -12,7 +12,7 @@ source "$FEISTY_MEOW_SCRIPTS/system/common_sysadmin.sh"
 # some convenient defaults for our current usage.
 
 if [ -z "$BASE_APPLICATION_PATH" ]; then
-  BASE_APPLICATION_PATH="$HOME/apps"
+  BASE_APPLICATION_PATH="$FEISTY_MEOW_APPS_DIR"
 fi
 if [ -z "$STORAGE_SUFFIX" ]; then
   STORAGE_SUFFIX="/public"
@@ -39,7 +39,7 @@ This script needs to know (1) the application name for the new site and
 appropriate name for a file-system compatible folder name.  There is an
 optional third parameter (3) the path for site storage.  If the site path
 is not provided, we'll use this path:
-  $BASE_APPLICATION_PATH/{app name}/$STORAGE_SUFFIX"
+  $BASE_APPLICATION_PATH/{app name}$STORAGE_SUFFIX"
   exit 1
 fi