export SSM_LOG_FILE="$TMP/$(logname)-siteavenger-script.log"
-# get our configuration loaded, if we know the config file.
-# if there is none, we will use our default version.
-export SITE_MANAGEMENT_CONFIG_FILE
-if [ -z "$SITE_MANAGEMENT_CONFIG_FILE" ]; then
- SITE_MANAGEMENT_CONFIG_FILE="$THISDIR/config/default.app"
- echo "$(date_stringer): Site management config file was not set. Using default:" >> "$SSM_LOG_FILE"
- echo "$(date_stringer): $SITE_MANAGEMENT_CONFIG_FILE" >> "$SSM_LOG_FILE"
-fi
-
-# load in at least the default version to get us moving.
-source "$SITE_MANAGEMENT_CONFIG_FILE"
-exit_on_error "loading site management configuration from: $SITE_MANAGEMENT_CONFIG_FILE"
-
# configure feisty revision control to ignore vendor folders.
export NO_CHECKIN_VENDOR=true
+# handles the computation of the base application path and the app dir name.
+# this expects to be passed the application directory name, but it will attempt to
+# do something intelligent if no name is passed in.
+function autoconfigure_paths()
+{
+ export app_dirname="$1"; shift
+
+ if [ -z "$app_dirname" ]; then
+ echo "$(date_stringer): Guessing application dir from local folder."
+ app_dirname="$(basename $(\pwd))"
+ export BASE_APPLICATION_PATH="$(dirname $(\pwd))"
+echo "calculated application dir of '$app_dirname' and"
+echo "a base app path of '$BASE_APPLICATION_PATH'"
+ fi
+
+ # get our configuration loaded, if we know the config file.
+ # if there is none, we will use our default version.
+ export SITE_MANAGEMENT_CONFIG_FILE
+ if [ -z "$SITE_MANAGEMENT_CONFIG_FILE" ]; then
+ SITE_MANAGEMENT_CONFIG_FILE="$THISDIR/config/default.app"
+ echo "$(date_stringer): Site management config file was not set. Using default:" >> "$SSM_LOG_FILE"
+ echo "$(date_stringer): $SITE_MANAGEMENT_CONFIG_FILE" >> "$SSM_LOG_FILE"
+ fi
+
+ # load in at least the default version to get us moving.
+ source "$SITE_MANAGEMENT_CONFIG_FILE"
+ exit_on_error "loading site management configuration from: $SITE_MANAGEMENT_CONFIG_FILE"
+
+
+echo "after site config file sourced, app dirname now '$app_dirname' and"
+echo "base app path now '$BASE_APPLICATION_PATH'"
+
+}
+
# tests that the main storage folder for apps exists.
+# the parameter passed in should be the application directory name (app_dirname), without
+# any additional path components. the script will attempt to auto-configure the application
+# base path (above the project folder with app_dirname) and get all the other path variables
+# established.
function check_apps_root()
{
- local appdir="$1"; shift
- if [ ! -d "$appdir" ]; then
- echo "$(date_stringer): Creating the apps directory: $appdir" >> "$SSM_LOG_FILE"
- mkdir "$appdir"
+ local temp_app_dirname="$1"; shift
+
+echo new call to auto conf func...
+ autoconfigure_paths "$temp_app_dirname"
+echo after call to auto conf func...
+
+ if [ -z "$BASE_APPLICATION_PATH" ]; then
+echo fix this: we had no base app path, what to do now?
+exit 1
+ fi
+
+ if [ ! -d "$BASE_APPLICATION_PATH" ]; then
+ echo "$(date_stringer): Creating the apps directory: $BASE_APPLICATION_PATH" >> "$SSM_LOG_FILE"
+ mkdir "$BASE_APPLICATION_PATH"
exit_on_error "Making apps directory when not already present"
fi
}
# make sure we're allowed to auto-guess the folder name from our current dir.
if [ -z "$NO_AUTOMATIC_FOLDER_GUESS" ]; then
- # if we can find an avenger5 directory above our current PWD, then that
- # might tell us our name.
- if find_named_parent_dir "avenger5"; then
- # we can grab a name above the avenger5 location. let's try that.
+ # if we can find the special checkout directory name above our current PWD, then that
+ # might tell us our project name.
+ if find_named_parent_dir "$CHECKOUT_DIR_NAME"; then
+ # we can grab a name above the checkout dir name location. let's try that.
app_dirname="$(basename "$(dirname $PARENT_DIR_FOUND)" )"
fi
else
exit_on_error "Making application directory when not already present"
fi
+echo yo combo is $combo
+
+ if [ -d "$combo/$CHECKOUT_DIRNAME" ]; then
+ echo "Dropping expectation for intermediary checkout directory name."
+ unset CHECKOUT_DIRNAME
+ fi
+
locate_config_file "$dir"
}
# updates the revision control repository passed in. this expects that the
# repo will live in a folder called "checkout_dirname" under the app path,
-# which is the standard for our deployed sites.
+# which is the standard for deployed site avenger sites. if that directory is
+# missing, then we assume a checkout of the top-level repository instead.
# important: this also sets a global variable called site_store_path to the full
# path of the application.
function update_repo()
pushd "$full_app_dir" &>/dev/null
exit_on_error "Switching to our app dir '$full_app_dir'"
- local complete_path="$full_app_dir/$checkout_dirname"
+ local complete_path="$full_app_dir"
+ if [ ! -z "$checkout_dirname" ]; then
+ # make the full path using the non-empty checkout dir name.
+ complete_path+="/$checkout_dirname"
+ fi
# see if the checkout directory exits. the repo_found variable is set to
# non-empty if we find it and it's a valid git repo.
repo_found=
- if [ -d "$checkout_dirname" ]; then
+ if [ -d "$full_app_dir" ]; then
# checkout directory exists, so let's check it.
- pushd "$checkout_dirname" &>/dev/null
- exit_on_error "Switching to our checkout directory: $checkout_dirname"
+ pushd "$full_app_dir" &>/dev/null
+ exit_on_error "Switching to directory for check out: $full_app_dir"
# ask for repository name (without .git).
if git rev-parse --git-dir > /dev/null 2>&1; then
exit_on_error "Git clone of repository: $repo_name"
fi
-#not doing this here since powerup uses this and has no sudo.
- #fix_site_perms "$complete_path"
-
#unused?
# construct the full path to where the app will actually live.
site_store_path="$complete_path"
# check for parameters.
app_dirname="$1"; shift
- check_apps_root "$BASE_APPLICATION_PATH"
+ check_apps_root "$app_dirname"
# find proper webroot where the site will be initialized.
if [ -z "$app_dirname" ]; then
projects / feisty_meow.git / blobdiff