From: Chris Koeritz Date: Fri, 18 May 2018 20:01:28 +0000 (-0400) Subject: this version has been denoised X-Git-Tag: 2.140.112^2~35 X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=42be4413b102e6b6d99e6210d15ca3c30206c642;p=feisty_meow.git this version has been denoised got rid of a lot of debug output by storing in a file in $TMP now. --- diff --git a/scripts/site_avenger/config/default.app b/scripts/site_avenger/config/default.app index 0235eb50..3690e0e5 100644 --- a/scripts/site_avenger/config/default.app +++ b/scripts/site_avenger/config/default.app @@ -43,20 +43,20 @@ export DISTRO="ubuntu" export APPLICATION_NAME="${app_dirname}" -echo app name was computed as $APPLICATION_NAME +echo app name was computed as $APPLICATION_NAME >> "$SSM_LOG_FILE" # change this if the site is on the "real" internet. export DOMAIN_NAME="${app_dirname}.vm" -echo domain name was computed as $DOMAIN_NAME +echo domain name was computed as $DOMAIN_NAME >> "$SSM_LOG_FILE" export REPO_NAME="${app_dirname}" -echo repo name was computed as $REPO_NAME +echo repo name was computed as $REPO_NAME >> "$SSM_LOG_FILE" export THEME_NAME="$(capitalize_first_char "${app_dirname}")" -echo theme name was computed as $THEME_NAME +echo theme name was computed as $THEME_NAME >> "$SSM_LOG_FILE" #### diff --git a/scripts/site_avenger/config/ecocor6.app b/scripts/site_avenger/config/ecocor6.app index d1d3edc5..da4741fd 100644 --- a/scripts/site_avenger/config/ecocor6.app +++ b/scripts/site_avenger/config/ecocor6.app @@ -3,6 +3,7 @@ # override for ecocor6 to set the theme. export THEME_NAME="Ecocor" -echo "*** overrode THEME_NAME as: $THEME_NAME" + +echo "*** overrode THEME_NAME as: $THEME_NAME" >> "$SSM_LOG_FILE" diff --git a/scripts/site_avenger/config/mapsdemo.app b/scripts/site_avenger/config/mapsdemo.app index 34fe6ce8..fb285625 100644 --- a/scripts/site_avenger/config/mapsdemo.app +++ b/scripts/site_avenger/config/mapsdemo.app @@ -5,6 +5,5 @@ export DOMAIN_NAME="${APPLICATION_NAME}.cakelampvm.com" - -echo "*** overrode domain name as: $DOMAIN_NAME" +echo "*** overrode domain name as: $DOMAIN_NAME" >> "$SSM_LOG_FILE" diff --git a/scripts/site_avenger/shared_site_mgr.sh b/scripts/site_avenger/shared_site_mgr.sh index f8247765..4f18ffcb 100644 --- a/scripts/site_avenger/shared_site_mgr.sh +++ b/scripts/site_avenger/shared_site_mgr.sh @@ -11,13 +11,15 @@ source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh" +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="$WORKDIR/config/default.app" - echo "Site management config file was not set. Using default:" - echo " $SITE_MANAGEMENT_CONFIG_FILE" + echo "Site management config file was not set. Using default:" >> "$SSM_LOG_FILE" + echo " $SITE_MANAGEMENT_CONFIG_FILE" >> "$SSM_LOG_FILE" fi # load in at least the default version to get us moving. @@ -32,7 +34,7 @@ function check_apps_root() { local appdir="$1"; shift if [ ! -d "$appdir" ]; then - echo "Creating the apps directory: $appdir" + echo "Creating the apps directory: $appdir" >> "$SSM_LOG_FILE" mkdir "$appdir" test_or_die "Making apps directory when not already present" fi @@ -44,14 +46,14 @@ function locate_config_file() local app_dirname="$1"; shift local configfile="$WORKDIR/config/${app_dirname}.app" - echo "config file?: $configfile" + echo "config file guessed?: $configfile" >> "$SSM_LOG_FILE" if [ ! -f "$configfile" ]; then # this is not a good config file. we can't auto-guess the config. echo -e " There is no specific site configuration file in: $configfile We will continue onward using the default and hope that this project follows -the standard pattern for cakephp projects." +the standard pattern for cakephp projects." >> "$SSM_LOG_FILE" # we'll pull in the default config file we set earlier; this will # reinitialize some variables based on the app name. else @@ -129,7 +131,7 @@ function test_app_folder() local combo="$appsdir/$dir" if [ ! -d "$combo" ]; then - echo "Creating app directory: $combo" + echo "Creating app directory: $combo" >> "$SSM_LOG_FILE" mkdir "$combo" test_or_die "Making application directory when not already present" fi @@ -184,8 +186,8 @@ function update_repo() local repo_root="$1"; shift local repo_name="$1"; shift -echo here are parms in update repo: -var full_app_dir checkout_dirname repo_root repo_name +echo here are parms in update repo: >> "$SSM_LOG_FILE" +var full_app_dir checkout_dirname repo_root repo_name >> "$SSM_LOG_FILE" # forget any prior value, since we are going to validate the path. unset site_store_path @@ -371,12 +373,12 @@ function fix_appdir_ownership() # go with the default user running the script. user_name="$USER" if [ ! -z "$user_name" -a "$user_name" != "root" ]; then - echo "Chowning the app folder to be owned by: $user_name" + echo "Chowning the app folder to be owned by: $user_name" >> "$SSM_LOG_FILE" #hmmm: have to hope for now for standard group named after user sudo chown -R "$user_name:$user_name" "$combo" test_or_die "Chowning $combo to be owned by $user_name" else - echo "user name failed checks for chowning, was found as '$user_name'" + echo "user name failed checks for chowning, was found as '$user_name'" >> "$SSM_LOG_FILE" fi # @@ -401,7 +403,7 @@ function switch_to() test_app_folder "$BASE_APPLICATION_PATH" "$app_dirname" fi if [ $? -ne 0 ]; then - echo "Could not locate that application directory" + echo "Could not locate the application directory: ${app_dirname}" return 1 fi