From e882e7e4aa39c3b46696172d515af5e4c6a9d455 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Wed, 7 Feb 2018 14:09:58 -0500 Subject: [PATCH] updates for regenerate --- .../docs/manual/cakelampvm_guide_v002.html | 2 +- readme.txt | 44 ++++++++++++------- scripts/core/common.alias | 7 +-- scripts/core/functions.sh | 1 + scripts/core/reconfigure_feisty_meow.sh | 2 - scripts/site_avenger/revamp_cakelampvm.sh | 6 +-- 6 files changed, 34 insertions(+), 28 deletions(-) diff --git a/production/sites/cakelampvm.com/docs/manual/cakelampvm_guide_v002.html b/production/sites/cakelampvm.com/docs/manual/cakelampvm_guide_v002.html index 81ba2ece..cedbdad1 100644 --- a/production/sites/cakelampvm.com/docs/manual/cakelampvm_guide_v002.html +++ b/production/sites/cakelampvm.com/docs/manual/cakelampvm_guide_v002.html @@ -170,7 +170,7 @@ use.  The updates are driven by the feisty meow script repository in conjunction with a local scripted command.  To activate the "update process" for your VM, run the following commands on the VM:

- 
# update to the latest version of feisty meow.
rpuffer $FEISTY_MEOW_APEX; reconfigure_feisty_meow
# enact any configuration changes needed, such as permissions and account setup.
+    
# update to the latest version of feisty meow.
rpuffer $FEISTY_MEOW_APEX; regenerate
# enact any configuration changes needed, such as permissions and account setup.
 revamp_cakelampvm

      
     
These two commands can be run at any time to patch up your VM to the
diff --git a/readme.txt b/readme.txt
index aaa8283b..b042ed8c 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,8 @@
 
 Quick Start Guide for the Feisty Meow Codebase
 
-Commands that can be typed in a console or terminal are are prefixed with "#".
+Commands that can be typed in a console or terminal are are prefixed with "$".
+(Do not include the dollar sign when copying and pasting commands.)
 Information that varies by platform is prefixed with a '|' character.
 
 This documentation assumes that the code is stored in the default location:
@@ -19,20 +20,19 @@ How to get the feisty meow codebase
 | https://feistymeow.org/feisty_meow/documentation/cygwin_install_list.txt (web)
 
 Retrieve a clone of the feisty meow codebase:
-# git clone git://feistymeow.org/feisty_meow
+$ git clone git://feistymeow.org/feisty_meow
 
 ==============
 
 How to load the feisty meow script environment
 
 Set up the feisty_meow scripts; this is only needed once, when you first get
-the codebase.  It will also regenerate the scripts using the latest installed
-version.
-# bash /opt/feistymeow.org/feisty_meow/scripts/core/reconfigure_feisty_meow.sh
+the codebase.
+$ bash /opt/feistymeow.org/feisty_meow/scripts/core/reconfigure_feisty_meow.sh
 
 Connect the feisty meow scripts to your login script (in ~/.bashrc).
 Note that this actually modifies ~/.bashrc.  This step is only needed once.
-# bash /opt/feistymeow.org/feisty_meow/scripts/core/connect_feisty_meow.sh
+$ bash /opt/feistymeow.org/feisty_meow/scripts/core/connect_feisty_meow.sh
 
 | For the root user, you can pass a flag '--root' to the connect_feisty_meow
 | script.  This will add an alias for 'feistyme' which loads the feisty meow
@@ -42,13 +42,13 @@ Load the script environment into the current shell.  This can be done for
 any new shell.  This is idempotent, so it does no harm to run it again.
 Note that you should not need this step if you connected feisty meow to
 ~/.bashrc above.
-# source /opt/feistymeow.org/feisty_meow/scripts/core/launch_feisty_meow.sh
+$ source /opt/feistymeow.org/feisty_meow/scripts/core/launch_feisty_meow.sh
 
 When the feisty meow script environment loaded, many new aliases and
 functions are available for use.  These come from the $FEISTY_MEOW_SCRIPTS
 folder.
-See the full list of commands at:
-(hmmm: To be completed in 2018)
+There is a list of feisty meow script commands available at:
+https://feistymeow.org/feisty_meow/documentation/feisty_meow_command_reference.txt
 
 ==============
 
@@ -59,13 +59,25 @@ differ utility and the feisty meow customization system).  They can be
 installed with either apt-get or CPAN.
 
 Install using apt-get (on Ubuntu or Debian-based OS):
-# sudo apt-get install libfile-which-perl libtext-diff-perl
+$ sudo apt-get install libfile-which-perl libtext-diff-perl
 
 or Install using perl's CPAN:
-# sudo cpan install Text::Diff File::Which
+$ sudo cpan install Text::Diff File::Which
 
 or on Cygwin (MS-Windows), install with apt-cyg:
-# apt-cyg install perl-File-Which perl-Text-Diff
+$ apt-cyg install perl-File-Which perl-Text-Diff
+
+==============
+
+How to update the feisty meow codebase to the latest online version
+
+This assumes that a somewhat current version of feisty meow is already
+installed and the scripts are loaded (see above section for how to load).
+
+The command below retrieves the latest version of feisty meow codebase
+from the online repository and regenerates the scripts.
+
+$ rpuffer $FEISTY_MEOW_APEX ; regenerate
 
 ==============
 
@@ -75,10 +87,10 @@ These dependencies are used for building the applications, tools and tests
 in the "nucleus", "octopi", "graphiq" and other C++ collections.
 
 | Ubuntu / Debian:
-| # sudo apt-get install build-essential librtmp-dev libcurl4-gnutls-dev libssl-dev
+| $ sudo apt-get install build-essential librtmp-dev libcurl4-gnutls-dev libssl-dev
 
 | Centos / Redhat / Fedora:
-| # sudo yum install gcc gcc-c++ openssl-devel.x86_64 curl-devel
+| $ sudo yum install gcc gcc-c++ openssl-devel.x86_64 curl-devel
 
 The "kona" collection depends on Java version 8 or better.
 
@@ -91,7 +103,7 @@ The "kona" collection depends on Java version 8 or better.
 How to build the feisty meow codebase
 
 Run the following command to build the feisty meow libraries and applications.
-# produce_feisty_meow
+$ produce_feisty_meow
 
 After the build is complete, the feisty meow applications can be found in
 the folder pointed at by the $FEISTY_MEOW_BINARIES environment variable.
@@ -101,7 +113,7 @@ the folder pointed at by the $FEISTY_MEOW_BINARIES environment variable.
 How to clean up the files generated by the build
 
 This command cleans out all the generated files:
-# whack_build clean
+$ whack_build clean
 
 ==============
 
diff --git a/scripts/core/common.alias b/scripts/core/common.alias
index 9eda7788..ea906108 100644
--- a/scripts/core/common.alias
+++ b/scripts/core/common.alias
@@ -55,7 +55,7 @@ fi
 # re-use work we did on 'exp' macro for the longer windows command.
 define_yeti_alias explorer=exp
 define_yeti_alias fix_ssh_perms='chmod 700 $HOME/.ssh ; chmod 600 $HOME/.ssh/*'
-define_yeti_alias get_feisty='rpuffer $FEISTY_MEOW_APEX; reconfigure_feisty_meow'
+define_yeti_alias get_feisty='rpuffer $FEISTY_MEOW_APEX; regenerate'
 define_yeti_alias halt='sudo shutdown -h now'
 define_yeti_alias i=inventory
 define_yeti_alias l='perl $FEISTY_MEOW_SCRIPTS/files/summing_dir.pl'
@@ -146,8 +146,3 @@ unalias fredme feistyme &>/dev/null
 
 ##############
 
-# set the sentinel alias that says this file was handled.
-#alias CORE_ALIASES_LOADED=true
-
-##############
-
diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh
index dc01d786..4ace5d80 100644
--- a/scripts/core/functions.sh
+++ b/scripts/core/functions.sh
@@ -452,6 +452,7 @@ if [ -z "$skip_all" ]; then
     unalias CORE_ALIASES_LOADED &>/dev/null
     unset -f function_sentinel 
     # reload feisty meow environment in current shell.
+    echo "reloading the feisty meow scripts."
     source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
     # run nechung oracle to give user a new fortune.
     nechung
diff --git a/scripts/core/reconfigure_feisty_meow.sh b/scripts/core/reconfigure_feisty_meow.sh
index 081fb96f..cf1e1b0f 100644
--- a/scripts/core/reconfigure_feisty_meow.sh
+++ b/scripts/core/reconfigure_feisty_meow.sh
@@ -81,6 +81,4 @@ if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then
   echo ==============
 fi
 
-# now try a full reload to get latest aliases and everything.
-source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 
diff --git a/scripts/site_avenger/revamp_cakelampvm.sh b/scripts/site_avenger/revamp_cakelampvm.sh
index 929480f7..fe09c4d5 100644
--- a/scripts/site_avenger/revamp_cakelampvm.sh
+++ b/scripts/site_avenger/revamp_cakelampvm.sh
@@ -39,8 +39,8 @@ sep
 
 echo "Regenerating feisty meow loading dock."
 
-reconfigure_feisty_meow
-test_or_die "feisty meow reconfiguration"
+regenerate
+test_or_die "regenerating feisty meow configuration"
 chown -R "$(logname)":"$(logname)" /home/$(logname)/.[a-zA-Z0-9]*
 test_or_die "fix after reconfigured as sudo"
 
@@ -342,7 +342,7 @@ echo "
 Thanks for revamping your cakelampvm.  :-)
 
 You may want to update your current shell's feisty meow environment by typing:
-  reconfigure_feisty_meow
+  regenerate
 "
 
 ##############
-- 
2.34.1