From 6d2ec9becc9374e514a30f49763eca1f071d0e73 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Fri, 5 Feb 2016 21:50:32 -0500 Subject: [PATCH] better naming... bootstrap_shells => reconfigure_feisty_meow and bootstrap_build => produce_feisty_meow --- building.txt | 4 ++-- doc/binaries_note.txt | 2 +- doc/clam_manual/clam_docs.html | 2 +- scripts/core/functions.sh | 4 ++-- scripts/core/generate_aliases.pl | 2 +- scripts/core/launch_feisty_meow.sh | 2 +- .../core/{bootstrap_shells.sh => reconfigure_feisty_meow.sh} | 2 +- .../generator/{bootstrap_build.sh => produce_feisty_meow.sh} | 2 +- scripts/rev_control/getem.sh | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) rename scripts/core/{bootstrap_shells.sh => reconfigure_feisty_meow.sh} (98%) rename scripts/generator/{bootstrap_build.sh => produce_feisty_meow.sh} (99%) diff --git a/building.txt b/building.txt index bd2be9e9..5e9f0a48 100644 --- a/building.txt +++ b/building.txt @@ -19,7 +19,7 @@ Quick Start for the Feisty Meow Codebase: Note that you may need to install some dependencies first (see below for installation instructions). - bash ~/feisty_meow/scripts/generator/bootstrap_build.sh + bash ~/feisty_meow/scripts/generator/produce_feisty_meow.sh All the applications can be found in $BINDIR after the build is complete. @@ -36,7 +36,7 @@ Quick Start for the Feisty Meow Codebase: Set up the feisty_meow scripts the first time; this is only needed once, unless you want to regenerate the scripts from the latest version. - bash ~/feisty_meow/scripts/core/bootstrap_shells.sh + bash ~/feisty_meow/scripts/core/reconfigure_feisty_meow.sh Load the script environment into the current shell. diff --git a/doc/binaries_note.txt b/doc/binaries_note.txt index 7c6b4355..d56dfe39 100644 --- a/doc/binaries_note.txt +++ b/doc/binaries_note.txt @@ -4,7 +4,7 @@ in the production/win32_helper folder. Feel free to not trust it. short_path.exe: This tool is built by the feisty meow application bootstrapping process - (that is, by scripts/generator/bootstrap_build.sh), but unfortunately it is + (that is, by scripts/generator/produce_feisty_meow.sh), but unfortunately it is needed *by* that process when your visual studio installation path has spaces in it. To fix this chicken & egg problem, you can manually change your VC root variable (e.g. VS100COMNTOOLS) to the short path version (as diff --git a/doc/clam_manual/clam_docs.html b/doc/clam_manual/clam_docs.html index 0be9ed9d..eb4a5485 100644 --- a/doc/clam_manual/clam_docs.html +++ b/doc/clam_manual/clam_docs.html @@ -307,7 +307,7 @@
  • If you would rather rebuild them from source, then running - the script "bin/bootstrap_build.sh" will + the script "scripts/generator/produce_feisty_meow.sh" will recreate all of these internal tools.
    • diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh index 3ecbca2f..09d8836a 100644 --- a/scripts/core/functions.sh +++ b/scripts/core/functions.sh @@ -367,7 +367,7 @@ if [ -z "$skip_all" ]; then if [ -z "$wheres_nechung" ]; then echo "The nechung oracle program cannot be found. You may want to consider" echo "rebuilding the feisty meow applications with this command:" - echo "bash $FEISTY_MEOW_SCRIPTS/generator/bootstrap_build.sh" + echo "bash $FEISTY_MEOW_SCRIPTS/generator/produce_feisty_meow.sh" else $wheres_nechung fi @@ -377,7 +377,7 @@ if [ -z "$skip_all" ]; then function regenerate() { # do the bootstrapping process again. echo "regenerating feisty meow script environment." - bash $FEISTY_MEOW_SCRIPTS/core/bootstrap_shells.sh + bash $FEISTY_MEOW_SCRIPTS/core/reconfigure_feisty_meow.sh echo # force a full reload by turning off sentinel variable and alias. # the nethack one is used by fred's customizations. diff --git a/scripts/core/generate_aliases.pl b/scripts/core/generate_aliases.pl index 8e4a70cf..726a0bbf 100644 --- a/scripts/core/generate_aliases.pl +++ b/scripts/core/generate_aliases.pl @@ -154,7 +154,7 @@ if ( ! length("$FEISTY_MEOW_LOADING_DOCK") ) { print "\ The FEISTY_MEOW_LOADING_DOCK variable is not defined. This must point to the location where\n\ the generated scripts are stored. Perhaps you still need to run\n\ -bootstrap_shells.sh and set up some environment variables. Please see\n\ +reconfigure_feisty_meow.sh and set up some environment variables. Please see\n\ http://feistymeow.org for more details.\n"; exit 1; #really need to use better exit codes. diff --git a/scripts/core/launch_feisty_meow.sh b/scripts/core/launch_feisty_meow.sh index 8f0a3a48..fec11079 100644 --- a/scripts/core/launch_feisty_meow.sh +++ b/scripts/core/launch_feisty_meow.sh @@ -34,7 +34,7 @@ if [ -z "$FEISTY_MEOW_LOADING_DOCK" ]; then if [ ! -f "$FEISTY_MEOW_VARIABLES_LOADING_FILE" ]; then echo -e '\n\n' echo "Feisty meow scripts need initialization via the bootstrap process, e.g.:" - echo " bash $HOME/feisty_meow/scripts/core/bootstrap_shells.sh" + echo " bash $HOME/feisty_meow/scripts/core/reconfigure_feisty_meow.sh" echo -e '\n\n' ERROR_OCCURRED=true fi diff --git a/scripts/core/bootstrap_shells.sh b/scripts/core/reconfigure_feisty_meow.sh similarity index 98% rename from scripts/core/bootstrap_shells.sh rename to scripts/core/reconfigure_feisty_meow.sh index 0e643254..3a36be63 100644 --- a/scripts/core/bootstrap_shells.sh +++ b/scripts/core/reconfigure_feisty_meow.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# bootstrap_shells: +# reconfigure_feisty_meow: # # This script creates the directory for auto-generated scripts and gets # the current user's account ready to use the feisty meow scripts. diff --git a/scripts/generator/bootstrap_build.sh b/scripts/generator/produce_feisty_meow.sh similarity index 99% rename from scripts/generator/bootstrap_build.sh rename to scripts/generator/produce_feisty_meow.sh index 94098504..354d2fb4 100644 --- a/scripts/generator/bootstrap_build.sh +++ b/scripts/generator/produce_feisty_meow.sh @@ -37,7 +37,7 @@ BUILD_SCRIPTS_DIR="$(echo $BUILD_SCRIPTS_DIR | tr '\\\\' '/' )" # load in feisty meow basic scripts, if not already loaded. if [ -z "$FEISTY_MEOW_SCRIPTS_LOADED" ]; then - bash "$BUILD_SCRIPTS_DIR/../core/bootstrap_shells.sh" + bash "$BUILD_SCRIPTS_DIR/../core/reconfigure_feisty_meow.sh" source "$BUILD_SCRIPTS_DIR/../core/launch_feisty_meow.sh" fi diff --git a/scripts/rev_control/getem.sh b/scripts/rev_control/getem.sh index 375f1135..06e9f95f 100644 --- a/scripts/rev_control/getem.sh +++ b/scripts/rev_control/getem.sh @@ -44,7 +44,7 @@ fi ############## # we now regenerate the scripts after getme, to ensure it's done automatically. -bash "$FEISTY_MEOW_SCRIPTS/core/bootstrap_shells.sh" +bash "$FEISTY_MEOW_SCRIPTS/core/reconfigure_feisty_meow.sh" perl "$FEISTY_MEOW_SCRIPTS/core/generate_aliases.pl" echo nechung -- 2.34.1