Merge branch 'dev' of feistymeow.org:feisty_meow into dev

diff --git a/infobase/feisty_inits/dot.bashrc-root b/infobase/feisty_inits/dot.bashrc-root
index 20a9023fadd3d1f596d6dc5f35b807923395a661..1b1dd1e23b279db6c64416b4c609fee2fd0c843f 100644 (file)
--- a/infobase/feisty_inits/dot.bashrc-root
+++ b/infobase/feisty_inits/dot.bashrc-root
@@ -26,6 +26,8 @@ export FEISTY_MEOW_APEX="/opt/feistymeow.org/feisty_meow"
 
 # the "fredme" macro enables the feisty_meow environment.
 alias fredme='source "$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh"'
+# synonym for fredme.
+alias feistyme='source "$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh"'
 
 # if not commented out, then feisty meow will run all the unit tests during builds.
 #export RUN_ALL_TESTS=true

diff --git a/scripts/core/common.alias b/scripts/core/common.alias
index 1a830c84288a9b9a6f42c65c233460567226029d..e311dc28bff7a691a3dec4d2cf7b081bea511dcf 100644 (file)
--- a/scripts/core/common.alias
+++ b/scripts/core/common.alias
@@ -79,6 +79,12 @@ define_yeti_alias up='cd ..'
 
 ##############
 
+# some information about the feisty meow codebase itself.
+
+define_yeti_alias feisty_branch='pushd $FEISTY_MEOW_APEX ; git branch ; popd'
+
+##############
+
 # extended aliases for meta-operations.
 define_yeti_alias dvd_rip='vobcopy -m'
 define_yeti_alias blu_rip='echo "what would this command be?"'

diff --git a/scripts/core/connect_feisty_meow.sh b/scripts/core/connect_feisty_meow.sh
index 9a5c81d548bb3b98b6b22e36a3009641f6cdb868..6a226b8dfe3e8c15b4c670e084a2f89154922c58 100644 (file)
--- a/scripts/core/connect_feisty_meow.sh
+++ b/scripts/core/connect_feisty_meow.sh
@@ -11,16 +11,31 @@ export FEISTY_MEOW_APEX="$( \cd "$WORKDIR/../.." && \pwd )"
 
 echo calculated apex as $FEISTY_MEOW_APEX
 
+do_root="$1"; shift
+
 if [ -f "$HOME/.bashrc" ] && grep -q "launch_feisty_meow.sh" "$HOME/.bashrc"; then
   # the stanza for loading feisty meow already seems to be present.
   echo "Feisty Meow already seems to be configured in '~/.bashrc'."
 else
-  # stuff the normal user init file into .bashrc.  not appropriate for root probably, but
-  # this is the easy quick start script for normal folks.
-  cat $FEISTY_MEOW_APEX/infobase/feisty_inits/dot.bashrc-normal-user |
-    sed -e \
-      "s?FEISTY_MEOW_APEX=\".*\"?FEISTY_MEOW_APEX=\"$FEISTY_MEOW_APEX\"?" \
-      >> "$HOME/.bashrc"
-  echo "Feisty Meow is now configured in '~/.bashrc'."
+  # check for the --root flag to see if they're trying to get the root version of inits.
+  if [ "$do_root" != "--root" ]; then
+    # stuff the "normal user" init file into .bashrc.  not appropriate for root.
+    # this is the easy and quick start script for most folks.
+    cat $FEISTY_MEOW_APEX/infobase/feisty_inits/dot.bashrc-normal-user |
+      sed -e \
+        "s?FEISTY_MEOW_APEX=\".*\"?FEISTY_MEOW_APEX=\"$FEISTY_MEOW_APEX\"?" \
+        >> "$HOME/.bashrc"
+    echo "Feisty Meow is now configured in '~/.bashrc' for standard users."
+  else
+    # stuff the root user init file into .bashrc.  this one doesn't automatically load
+    # feisty meow.  instead, it provides a fredme macro to load the feisty meow scripts.
+    # fredme comes from the main author being fred t. hamster.  we have since added a
+    # feistyme macro too, to be less personalized...
+    cat $FEISTY_MEOW_APEX/infobase/feisty_inits/dot.bashrc-root |
+      sed -e \
+        "s?FEISTY_MEOW_APEX=\".*\"?FEISTY_MEOW_APEX=\"$FEISTY_MEOW_APEX\"?" \
+        >> "$HOME/.bashrc"
+    echo "Feisty Meow is now configured in '~/.bashrc' for the root user."
+  fi
 fi
 

diff --git a/scripts/site_avenger/standup.sh b/scripts/site_avenger/standup.sh
index 762bd1ef6e8ba20e26e171fa99f7c6757fecbb66..2ae953bb53409badf3ae85cafce07eee893d513f 100644 (file)
--- a/scripts/site_avenger/standup.sh
+++ b/scripts/site_avenger/standup.sh
@@ -53,77 +53,9 @@ test_or_die "Setting up apache site for: $APPLICATION_NAME"
 
 powerup "$APPLICATION_NAME" "$REPO_NAME" "$THEME_NAME"
 
-
-
-
-
 sep
 
 echo "
 Finished standing up the full domain and site in:
 ${app_dirname}"
 
-#leave before old crud below
-exit 0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#below is probably not needed.
-# find proper webroot where the site will be initialized.
-if [ -z "$app_dirname" ]; then
-  # no dir was passed, so guess it.
-  find_app_folder "$APPLICATION_DIR"
-else
-  test_app_folder "$APPLICATION_DIR" "$app_dirname"
-fi
-
-# where we expect to find our checkout folder underneath.
-full_app_dir="$APPLICATION_DIR/$app_dirname"
-
-# use our default values for the repository and theme if they're not provided.
-if [ -z "$repo_name" ]; then
-  repo_name="$app_dirname"
-fi
-if [ -z "$theme_name" ]; then
-  theme_name="$(capitalize_first_char ${app_dirname})"
-fi
-
-echo "Repository: $repo_name"
-echo "Theme name: $theme_name"
-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"
-test_or_die "Updating the repository storage directory"
-
-# update the site to load dependencies.
-sep
-composer_repuff "$site_store_path"
-test_or_die "Installing site dependencies with composer"
-
-# set up the symbolic links needed to achieve siteliness.
-sep
-
-create_site_links "$site_store_path" "$theme_name"
-
-sep
-
-echo "Finished powering up the site in '${app_dirname}'."
-