From: Chris Koeritz Date: Mon, 13 Nov 2017 03:55:51 +0000 (-0500) Subject: cleaning up logging X-Git-Tag: 2.140.98^2~1^2~1 X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;ds=inline;h=f3e2e0d8a7bb96505d0dded3bfab99f1cd2a4a99;hp=-c;p=feisty_meow.git cleaning up logging --- f3e2e0d8a7bb96505d0dded3bfab99f1cd2a4a99 diff --git a/scripts/site_avenger/shared_site_mgr.sh b/scripts/site_avenger/shared_site_mgr.sh index d4c5c95a..56e658e2 100644 --- a/scripts/site_avenger/shared_site_mgr.sh +++ b/scripts/site_avenger/shared_site_mgr.sh @@ -190,12 +190,10 @@ var full_app_dir checkout_dirname repo_root repo_name local complete_path="$full_app_dir/$checkout_dirname" -echo A # 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 -echo B # checkout directory exists, so let's check it. pushd "$checkout_dirname" &>/dev/null test_or_die "Switching to our checkout directory: $checkout_dirname" @@ -206,7 +204,6 @@ echo B repo_found=yes fi -echo C # we don't consider the state of having the dir exist but the repo be wrong as good. if [ -z "$repo_found" ]; then echo "There is a problem; this folder is not a valid repository:" @@ -217,22 +214,18 @@ echo C popd &>/dev/null fi -echo D if [ ! -z "$repo_found" ]; then # a repository was found, so update the version here and leave. -echo E echo "Repository $repo_name exists. Updating it." rgetem test_or_die "Recursive checkout on: $complete_path" else -echo F # clone the repo since it wasn't found. echo "Cloning repository $repo_name now." git clone "$repo_root/$repo_name.git" $checkout_dirname test_or_die "Git clone of repository: $repo_name" fi -echo G fix_site_perms "$complete_path" # construct the full path to where the app will actually live. diff --git a/scripts/site_avenger/standup.sh b/scripts/site_avenger/standup.sh index 96ec4cf3..ae64d2b8 100644 --- a/scripts/site_avenger/standup.sh +++ b/scripts/site_avenger/standup.sh @@ -67,7 +67,7 @@ else test_app_folder "$APPLICATION_DIR" "$app_dirname" fi -echo "!! domain being added is: $DOMAIN_NAME" +#echo "!! domain being added is: $DOMAIN_NAME" sudo bash "$FEISTY_MEOW_SCRIPTS/system/add_domain.sh" "$DOMAIN_NAME" test_or_die "Setting up domain: $DOMAIN_NAME" @@ -79,8 +79,8 @@ test_or_die "Setting up apache site for: $APPLICATION_NAME" sep -echo about to do powerup with: app="$APPLICATION_NAME" repo="$REPO_NAME" theme="$THEME_NAME" -echo default repo is "$DEFAULT_REPOSITORY_ROOT" +#echo about to do powerup with: app="$APPLICATION_NAME" repo="$REPO_NAME" theme="$THEME_NAME" +#echo default repo is "$DEFAULT_REPOSITORY_ROOT" powerup "$APPLICATION_NAME" "$REPO_NAME" "$THEME_NAME" # pass the real user name who should own the files. @@ -89,6 +89,7 @@ powerup "$APPLICATION_NAME" "$REPO_NAME" "$THEME_NAME" sep echo " -Finished standing up the full domain and site in: -${app_dirname}" +Finished standing up the full domain and site for: ${app_dirname} +The domain name is: $DOMAIN_NAME +"