tasty revision to load feisty for full use

instead of piecemeal loading of certain files, like functions.sh, i have swerved over into the oncoming lane where we now just pull in the feisty meow startup process.  shouldn't take any extra time if it was already loaded or assets like aliases survived into the running shell.  but the great thing is now that i can stop referring to scripts with paths if needed (when in bash), because the functions and aliases i expect to be able to use are now available.  dovetails with earlier removal of lightweight init feature.

diff --git a/examples/legacy/gpg-daemon-launcher.sh b/examples/legacy/gpg-daemon-launcher.sh
index 8905405505e9618950a27038978523baa32312e8..f59c6d1fbc683a253c37e70bf70844407136b282 100644 (file)
--- a/examples/legacy/gpg-daemon-launcher.sh
+++ b/examples/legacy/gpg-daemon-launcher.sh
@@ -11,7 +11,7 @@
 
 # starts up the gpg-agent, but only if it's not already running.
 
-source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 
 if [ -z "$(psa gpg-agent)" ]; then
   gpg-agent --daemon --enable-ssh-support --write-env-file "${HOME}/.gpg-agent-info" &>$TMP/zz_gpg-agent-daemon.log

diff --git a/infobase/configuration/trac/trac_startup.sh b/infobase/configuration/trac/trac_startup.sh
index 87c5668c0440a8a27caefc2ee493d971eb581d16..7326c815b99c76adc97e01337fb753dc5a266e75 100644 (file)
--- a/infobase/configuration/trac/trac_startup.sh
+++ b/infobase/configuration/trac/trac_startup.sh
@@ -7,7 +7,7 @@
 #
 # Author: Chris Koeritz
 
-source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 
 # we only try to do something if trac is missing.
 if [ "$(psfind tracd)" ]; then

diff --git a/scripts/archival/pack_feisty_meow.sh b/scripts/archival/pack_feisty_meow.sh
index 67a52bf92b9857c2e0aef9dd073e90a848d4251c..f98c004ae8f19ad5e91e546b4cd8b2b2f8b66ec4 100644 (file)
--- a/scripts/archival/pack_feisty_meow.sh
+++ b/scripts/archival/pack_feisty_meow.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source $FEISTY_MEOW_SCRIPTS/core/functions.sh
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 
 TEMPO_FILE="$(mktemp "$TMP/zz_feistypack.XXXXXX")"
   # specify where we keep the file until we're ready to move it.

diff --git a/scripts/buildor/buildor_make_code_writable.sh b/scripts/buildor/buildor_make_code_writable.sh
index 494159d03a2b6e925a9c040922ca090513700ca3..dfc88532bbfe3d9185e5a6d1102190f3851257dd 100644 (file)
--- a/scripts/buildor/buildor_make_code_writable.sh
+++ b/scripts/buildor/buildor_make_code_writable.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
-source $FEISTY_MEOW_SCRIPTS/buildor/seek_all_source.sh
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
+source "$FEISTY_MEOW_SCRIPTS/buildor/seek_all_source.sh"
 
 function strip_file {
   file=$1

diff --git a/scripts/buildor/buildor_strip_code.sh b/scripts/buildor/buildor_strip_code.sh
index 0d0dbed0b53bbed9f94a0adb6c598777091f0cf7..dc03704ac2a4b73c901565ea9b5216662007b364 100644 (file)
--- a/scripts/buildor/buildor_strip_code.sh
+++ b/scripts/buildor/buildor_strip_code.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 source "$FEISTY_MEOW_SCRIPTS/buildor/seek_all_source.sh"
 
 function strip_file {

diff --git a/scripts/buildor/find_one_word_comments.sh b/scripts/buildor/find_one_word_comments.sh
index bfd95adee08432dc6ea79b042bb3480a131ce86f..cefa1a9d22dd883b92b8342d53d7ba15e239b0a4 100644 (file)
--- a/scripts/buildor/find_one_word_comments.sh
+++ b/scripts/buildor/find_one_word_comments.sh
@@ -8,6 +8,7 @@
 
 SOURCES_FOUND_LIST="$(mktemp "$TMP/sources_found.XXXXXX")"
 
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 source $FEISTY_MEOW_SCRIPTS/buildor/seek_all_source.sh $*
   # got a list of source files now.
 

diff --git a/scripts/buildor/refresh_gffs_build.sh b/scripts/buildor/refresh_gffs_build.sh
index a5b0c1b97a09d2389369d6300cb6b0897b7c8c1f..2211879584a437e6b40056782d891f34b467b73b 100644 (file)
--- a/scripts/buildor/refresh_gffs_build.sh
+++ b/scripts/buildor/refresh_gffs_build.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
-source $FEISTY_MEOW_SCRIPTS/buildor/gffs_builders.sh
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
+source "$FEISTY_MEOW_SCRIPTS/buildor/gffs_builders.sh"
 
 echo stopping any running genesis processes...
 bash $GFFS_TOOLKIT_ROOT/library/zap_genesis_javas.sh 

diff --git a/scripts/buildor/stdbuild.sh b/scripts/buildor/stdbuild.sh
index a084d3b1fd8dbeb91a641358dc3ec3da137f7435..13fd1fd9de96d572b649c9d026996cb7b54ff4d4 100644 (file)
--- a/scripts/buildor/stdbuild.sh
+++ b/scripts/buildor/stdbuild.sh
@@ -5,7 +5,7 @@
 #
 # go to the main folder of the project you're building before you run this.
 
-source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 
 echo "$(date_stringer)"
 echo "Building application from $(\pwd)"

diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh
index 86d8999158c41a6f5df37ea10c13b0f219464272..67c58455f90ed54a6324e27db32185bc1f77981d 100644 (file)
--- a/scripts/core/functions.sh
+++ b/scripts/core/functions.sh
@@ -307,7 +307,7 @@ if [ -z "$skip_all" ]; then
       # information for su.
   
       # get the x authority info for our current user.
-      source $FEISTY_MEOW_SCRIPTS/x_win/get_x_auth.sh
+      source "$FEISTY_MEOW_SCRIPTS/x_win/get_x_auth.sh"
   
       if [ -z "$X_auth_info" ]; then
         # if there's no authentication info to pass along, we just do a normal su.
@@ -369,7 +369,7 @@ if [ -z "$skip_all" ]; then
     unalias CORE_ALIASES_LOADED &>/dev/null
     unset -f function_sentinel 
     # reload feisty meow environment in current shell.
-    source $FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh
+    source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
     # run nechung oracle to give user a new fortune.
     nechung
     restore_terminal_title

diff --git a/scripts/core/inventory.sh b/scripts/core/inventory.sh
index 2f58c54cb5c7030bcafcc4d0de9d16f7c50ee0e2..e2290d5afccd8102d67c6530bcf1bfd7b677b2b5 100644 (file)
--- a/scripts/core/inventory.sh
+++ b/scripts/core/inventory.sh
@@ -3,7 +3,7 @@
 # a frivolous but useful script that shows information about the local
 # computer in terms of an adventure game inventory listing.
 
-source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 
 unset -v codename osname osver
 if [ $OPERATING_SYSTEM == "UNIX" ]; then

diff --git a/scripts/core/launch_feisty_meow.sh b/scripts/core/launch_feisty_meow.sh
index 70b1b0cafa0c26654b74526c4259200d2eba0bbe..db00c382eafa22b1c5005bc96ae00ab02d8b18b3 100644 (file)
--- a/scripts/core/launch_feisty_meow.sh
+++ b/scripts/core/launch_feisty_meow.sh
@@ -46,7 +46,7 @@ if [ -z "$FEISTY_MEOW_LOADING_DOCK" ]; then
   source "$FEISTY_MEOW_VARIABLES_LOADING_FILE"
 
   # Set up the temporary directory.
-  source $FEISTY_MEOW_SCRIPTS/core/create_tempdir.sh
+  source "$FEISTY_MEOW_SCRIPTS/core/create_tempdir.sh"
 
 fi
 
@@ -55,7 +55,7 @@ fi
 # load the larger body of standard feisty meow variables into the environment.
 # we actually want this to always run also; it will decide what variables need
 # to be set again.
-source $FEISTY_MEOW_SCRIPTS/core/variables.sh
+source "$FEISTY_MEOW_SCRIPTS/core/variables.sh"
 
 ##############
   

diff --git a/scripts/core/search_replace.sh b/scripts/core/search_replace.sh
index 9825c6cadeea546c7f2a75b644b51ec91b87edd1..8357761a4c8a9959c68a24cb075c3dedf1bc8afa 100644 (file)
--- a/scripts/core/search_replace.sh
+++ b/scripts/core/search_replace.sh
@@ -3,7 +3,7 @@
 # a break out of the popular replace_pattern_in_file function that
 # can work with multiple files.
 
-source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 
 pattern="$1"; shift
 replacement="$1"; shift

diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index bd11c4654303377fef87642661c470262b2d0b98..9cecadf848a57d8bfb24090c9fdcb58e155f3138 100644 (file)
--- a/scripts/core/variables.sh
+++ b/scripts/core/variables.sh
@@ -163,7 +163,7 @@ if [ -z "$CORE_VARIABLES_LOADED" ]; then
       # choose perl's IO over the ms-windows version so we can handle file
       # bytes properly.
   fi
-  
+
   # iterate across our sub-directories and find the perl scripts.
   # this currently only looks one level down.
   for i in $FEISTY_MEOW_SCRIPTS/*; do

diff --git a/scripts/customize/fred/scripts/gamesaver.sh b/scripts/customize/fred/scripts/gamesaver.sh
index 0cd6b72524e69c7feff7571210a5de47b062835e..1e5ea9ca8ab6195be56feacc7cab5db35d94fdf4 100644 (file)
--- a/scripts/customize/fred/scripts/gamesaver.sh
+++ b/scripts/customize/fred/scripts/gamesaver.sh
@@ -3,7 +3,7 @@
 # a helpful script that scrapes any active game saves from wine's storage
 # area into a spooling saves folder for archiving.
 
-source $FEISTY_MEOW_SCRIPTS/core/functions.sh
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 
 WINE_SOURCE_DIR="$HOME/wine_goods/My Games"
 SPOOLING_OUTPUT_DIR="$HOME/spooling_saves"

diff --git a/scripts/customize/fred/scripts/musical_wand.sh b/scripts/customize/fred/scripts/musical_wand.sh
index e25a4707d3f5c54ed210e89f01813da521c75602..37dccc87818a7a162b3c75dccb11df553755784d 100644 (file)
--- a/scripts/customize/fred/scripts/musical_wand.sh
+++ b/scripts/customize/fred/scripts/musical_wand.sh
@@ -9,7 +9,7 @@
 # is synched onto the other archive hosts.  in that sense, the musical host is itself a
 # musix archive, but it is treated "special".
 
-source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 
 #hmmm: add the goodness around these actions like the "nice" updater so we catch all errors.
 

diff --git a/scripts/customize/fred/scripts/sftp.sh b/scripts/customize/fred/scripts/sftp.sh
index c668500cb1480570fe2f5abdf54b40d4854fd611..8753ac473c4fccdf96eef3ebda2c33f12229a571 100644 (file)
--- a/scripts/customize/fred/scripts/sftp.sh
+++ b/scripts/customize/fred/scripts/sftp.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 source "$FEISTY_MEOW_LOADING_DOCK/custom/scripts/pick_credentials.sh"
 
 # a wrapper for the file transfers using secure shell.

diff --git a/scripts/customize/fred/scripts/ssh.sh b/scripts/customize/fred/scripts/ssh.sh
index 3c77a5ac1ddaa26e6969b49ae62679daaed6e5a9..0c7897c43b2c549d8676c3cc825b43d118f53a04 100644 (file)
--- a/scripts/customize/fred/scripts/ssh.sh
+++ b/scripts/customize/fred/scripts/ssh.sh
@@ -2,6 +2,7 @@
 
 # wraps calling the secure shell to let us pick our appropriate credentials.
 
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 source "$FEISTY_MEOW_SCRIPTS/tty/terminal_titler.sh"
 
 #hmmm: is this still used???

diff --git a/scripts/customize/fred/scripts/update_soapbox.sh b/scripts/customize/fred/scripts/update_soapbox.sh
index df5921c0989931df3e8c86a03b90212ac7f49e02..90a0e0b0aa18107c2b9ddfa63335f9730749dd87 100644 (file)
--- a/scripts/customize/fred/scripts/update_soapbox.sh
+++ b/scripts/customize/fred/scripts/update_soapbox.sh
@@ -2,7 +2,7 @@
 
 # updates my little 1 TB "soapbox" style usb drive with items that it should contain.
 
-source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 
 function get_source()
 {

diff --git a/scripts/email/move_spams_and_check.sh b/scripts/email/move_spams_and_check.sh
index e4bfd43ad4d5de3b46db11bebdefb57333f1a899..0902a35c8392312bf4ffd3d6af7c81d53b15c671 100644 (file)
--- a/scripts/email/move_spams_and_check.sh
+++ b/scripts/email/move_spams_and_check.sh
@@ -6,7 +6,7 @@
 # after the spam is all snagged, it is scanned for any untoward presence
 # of non-spam folks using the user's valid email list.
 
-source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 
 # the storage area that the spam catcher tool puts the suspected spam into.
 SPAM_SPOOL="/var/spool/sa-exim"

diff --git a/scripts/files/squish_directories.sh b/scripts/files/squish_directories.sh
index e19bf97fabd7428d223cf22acf1e5023de2428a4..8682e30d0a04a1ae3e7bfe6264889467722d2257 100644 (file)
--- a/scripts/files/squish_directories.sh
+++ b/scripts/files/squish_directories.sh
@@ -7,7 +7,7 @@
 
 #hmmm: may want to revisit default behavior.
 
-source $FEISTY_MEOW_SCRIPTS/core/functions.sh
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 
 dirs=()
 

diff --git a/scripts/generator/build_variables.sh b/scripts/generator/build_variables.sh
index e30bd07913f9b4b0bd4f2d15d0e80ffad7cc26d0..18f402f7a5e78d308a3587439c67122ffca102ec 100644 (file)
--- a/scripts/generator/build_variables.sh
+++ b/scripts/generator/build_variables.sh
@@ -46,7 +46,7 @@ PARM_1="$1"
 
 # helpful build function zone.
 
-source $FEISTY_MEOW_SCRIPTS/core/functions.sh
+source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
 
 ##############
 

diff --git a/scripts/generator/wrapdoze.sh b/scripts/generator/wrapdoze.sh
index c28d0e722e68afe0e8b28f39f7bb85988ae3776c..99f05ef949860a96fc8efcbcf19883ccfc25c8f6 100755 (executable)
--- a/scripts/generator/wrapdoze.sh
+++ b/scripts/generator/wrapdoze.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source $FEISTY_MEOW_SCRIPTS/core/functions.sh
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 
 #hmmm: make this support multiple vars as parameters.
 # replaces a specific environment variable with a dos approved equivalent.

diff --git a/scripts/makefile b/scripts/makefile
index 773fea686e970631d9692b6bf1d6053db0a26a39..a660a707a6f13333908df267f6b49e528550a697 100644 (file)
--- a/scripts/makefile
+++ b/scripts/makefile
@@ -14,6 +14,6 @@ regenerate:
        echo "FEISTY_MEOW_LOADING_DOCK = $(FEISTY_MEOW_LOADING_DOCK)"
        $(CATCHER)'if [ ! -d $(FEISTY_MEOW_LOADING_DOCK) ]; then mkdir -p $(FEISTY_MEOW_LOADING_DOCK); fi'
        $(CATCHER)perl $(FEISTY_MEOW_SCRIPTS)/core/generate_aliases.pl
-       $(CATCHER)'(source $(FEISTY_MEOW_SCRIPTS)/core/launch_feisty_meow.sh; perl $(FEISTY_MEOW_SCRIPTS)/text/new_sig.pl)'
+       $(CATCHER)'(source "$(FEISTY_MEOW_SCRIPTS)/core/launch_feisty_meow.sh"; perl $(FEISTY_MEOW_SCRIPTS)/text/new_sig.pl)'
 
 

diff --git a/scripts/multimedia/sound_play.sh b/scripts/multimedia/sound_play.sh
index 2110a4b69593f579b85285db5302ad51de7867e2..962efd61318fe8493c064e494f2afac4604165f6 100644 (file)
--- a/scripts/multimedia/sound_play.sh
+++ b/scripts/multimedia/sound_play.sh
@@ -2,7 +2,7 @@
 
 # play the sound files specified.
 
-source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"  # provides psfind.
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 
 if [ $# -lt 1 ]; then
   #echo no sound file specified.

diff --git a/scripts/opensim/backup_opensim.sh b/scripts/opensim/backup_opensim.sh
index 7974f0d8ac50feb0490c5eebd0f0243dfbd7fe89..892a13e410375af817729cd95faba792841ff9c8 100644 (file)
--- a/scripts/opensim/backup_opensim.sh
+++ b/scripts/opensim/backup_opensim.sh
@@ -15,7 +15,7 @@ fi
 #      would be nice to have a block of opensim variables, perhaps an associative
 #      array of config chunks.
 
-source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 
 host=$(echo $(hostname) | sed -e 's/\([^.]*\)\..*/\1/')
 

diff --git a/scripts/opensim/backup_osgrid.sh b/scripts/opensim/backup_osgrid.sh
index 865ca4d888dcb443720b8c3e8a6f2b2fc58e7c11..959aabf425ac80964614089887ec67c8c4e5191b 100644 (file)
--- a/scripts/opensim/backup_osgrid.sh
+++ b/scripts/opensim/backup_osgrid.sh
@@ -5,7 +5,7 @@
 #      would be nice to have a block of opensim variables, perhaps an associative
 #      array of config chunks.
 
-source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 
 host=$(echo $(hostname) | sed -e 's/\([^.]*\)\..*/\1/')
 

diff --git a/scripts/opensim/maybe_restart_opensim.sh b/scripts/opensim/maybe_restart_opensim.sh
index dc8a4b2ae379712f60861b8d90b98a2b61b930f0..f6d5e7a4e11be4001f4bfb4adffcb656365c5676 100644 (file)
--- a/scripts/opensim/maybe_restart_opensim.sh
+++ b/scripts/opensim/maybe_restart_opensim.sh
@@ -4,7 +4,8 @@
 
 #hmmm: this is really more for osgrid, since opensim has two servers.
 
-source $FEISTY_MEOW_SCRIPTS/opensim/opensim_utils.sh
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
+source "$FEISTY_MEOW_SCRIPTS/opensim/opensim_utils.sh"
 
 # see if the process is findable.
 # (this approach will not work if the process actually freezes up but

diff --git a/scripts/opensim/opensim_utils.sh b/scripts/opensim/opensim_utils.sh
index c45ab0de0113d63c789de05d0483a677516d6188..695c09cf6afddb7f25ad091ba9430b582f6d118f 100644 (file)
--- a/scripts/opensim/opensim_utils.sh
+++ b/scripts/opensim/opensim_utils.sh
@@ -2,7 +2,7 @@
 # this is a collection of scripts that assist in managing an opensim server.
 # it uses the "screen" utility to manage opensimulator instances.
 
-source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 
 # set up some parameters that we believe (or have been told) are beneficial.
 export MONO_THREADS_PER_CPU=1208

diff --git a/scripts/opensim/run_opensim.sh b/scripts/opensim/run_opensim.sh
index 04499bdb39db5dcaca90d582c7d74ca4184bb8cb..674786f9dce37bbda1f2d6ff7aeeb1cc75453cae 100644 (file)
--- a/scripts/opensim/run_opensim.sh
+++ b/scripts/opensim/run_opensim.sh
@@ -3,7 +3,8 @@
 # utility.  then the processes can all be accessed when desired, rather than
 # needing to be started in 5 or so separate windows.
 
-source $FEISTY_MEOW_SCRIPTS/opensim/opensim_utils.sh
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
+source "$FEISTY_MEOW_SCRIPTS/opensim/opensim_utils.sh"
 
 # jump into the opensim binaries directory so we can run stuff.
 pushd $HOME/opensim/bin &>/dev/null

diff --git a/scripts/opensim/run_osgrid.sh b/scripts/opensim/run_osgrid.sh
index 2d1d7752f43a25ac53d696e47d22eb5ca1096954..b03f62b1e7f5f4d5a015712a0846fc1c8002df1c 100644 (file)
--- a/scripts/opensim/run_osgrid.sh
+++ b/scripts/opensim/run_osgrid.sh
@@ -3,7 +3,8 @@
 # screen utility.  note that this will only be useful for an osgrid-attached
 # sim server.
 
-source $FEISTY_MEOW_SCRIPTS/opensim/opensim_utils.sh
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
+source "$FEISTY_MEOW_SCRIPTS/opensim/opensim_utils.sh"
 
 # jump into the opensim binaries directory so we can run stuff.
 pushd $HOME/opensim/bin &>/dev/null

diff --git a/scripts/opensim/stop_opensim.sh b/scripts/opensim/stop_opensim.sh
index 7bdad6f3a8c050097f16bcd35fb4c567bc515470..9b885e351f611c0f87a76cdd6255308512a06a86 100644 (file)
--- a/scripts/opensim/stop_opensim.sh
+++ b/scripts/opensim/stop_opensim.sh
@@ -2,7 +2,8 @@
 # this script stops a 0.6.9 era opensimulator system that was started by
 # the run_opensim or run_osgrid script.  this will work for either case.
 
-source $FEISTY_MEOW_SCRIPTS/opensim/opensim_utils.sh
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
+source "$FEISTY_MEOW_SCRIPTS/opensim/opensim_utils.sh"
 
 # the brains for the script is the screen and process names we need to control.
 close_application opensim OpenSim.exe

diff --git a/scripts/opensim/stop_osgrid.sh b/scripts/opensim/stop_osgrid.sh
index 8a3cf900b6e575c62badcab7715ff013b1f01216..036e58417752f475ab73ff401039e8cdce2fbc47 100644 (file)
--- a/scripts/opensim/stop_osgrid.sh
+++ b/scripts/opensim/stop_osgrid.sh
@@ -2,7 +2,8 @@
 # this script stops a 0.6.9 era opensimulator system that was started by
 # the run_opensim or run_osgrid script.  this will work for either case.
 
-source $FEISTY_MEOW_SCRIPTS/opensim/opensim_utils.sh
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
+source "$FEISTY_MEOW_SCRIPTS/opensim/opensim_utils.sh"
 
 # the brains for the script is the screen and process names we need to control.
 close_application opensim OpenSim.exe

diff --git a/scripts/processes/goodbye.sh b/scripts/processes/goodbye.sh
index 674a1197c45d492ae99974e1869193f2645a5fc7..99501f1011a3db67023ec2165d095642b41be2d3 100644 (file)
--- a/scripts/processes/goodbye.sh
+++ b/scripts/processes/goodbye.sh
@@ -2,7 +2,7 @@
 
 # just prints a message before terminal exit.
 
-source $FEISTY_MEOW_SCRIPTS/core/functions.sh
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 
 nechung
 

diff --git a/scripts/processes/pskill.sh b/scripts/processes/pskill.sh
index a9fb3815b7ce52e97baaf9a611ad49d9db93ba0c..31e119f838bd215c738e2f786f5aa2377e25ef05 100644 (file)
--- a/scripts/processes/pskill.sh
+++ b/scripts/processes/pskill.sh
@@ -4,7 +4,7 @@ if [ -z "$1" ]; then
   exit 2
 fi
 
-source "$FEISTY_MEOW_SCRIPTS/functions.sh"  # provides psfind.
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 
 PIDLIST=$(psfind $1)
 #echo "PIDS are $PIDLIST"

diff --git a/scripts/processes/show_hot_ones.sh b/scripts/processes/show_hot_ones.sh
index 1ac279f08e374797a8e530746cd2b3c4a2cef840..786bf17406e3d65868b03666c9223e428f2893e7 100644 (file)
--- a/scripts/processes/show_hot_ones.sh
+++ b/scripts/processes/show_hot_ones.sh
@@ -2,7 +2,7 @@
 
 # shows the current processes ordered by cpu usage.
 
-source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 
 sep
 echo "Process list by CPU usage for $(date)"

diff --git a/scripts/rev_control/checkin.sh b/scripts/rev_control/checkin.sh
index 78d030657a670a05f3f0558f21ce99f4d90aa7ba..76e0c7f07520596459859284c72c79f3249b07c2 100644 (file)
--- a/scripts/rev_control/checkin.sh
+++ b/scripts/rev_control/checkin.sh
@@ -2,7 +2,7 @@
 
 # checkin: checks in all the folders present in the REPOSITORY_LIST variable.
 
-source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 source "$FEISTY_MEOW_SCRIPTS/rev_control/version_control.sh"
 
 ##############

diff --git a/scripts/rev_control/getem.sh b/scripts/rev_control/getem.sh
index 983ba7874a9f5da8bc5fe284f12d12ae85f061b6..ace37be86673145800212ad702c669387b50def9 100644 (file)
--- a/scripts/rev_control/getem.sh
+++ b/scripts/rev_control/getem.sh
@@ -2,7 +2,7 @@
 
 # gets any updates for the repository folders present in the REPOSITORY_LIST variable.
 
-source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 source "$FEISTY_MEOW_SCRIPTS/rev_control/version_control.sh"
 
 # trickery to ensure we can always update this file, even when the operating system has some

diff --git a/scripts/rev_control/rev_checkin.sh b/scripts/rev_control/rev_checkin.sh
index 808f21a7dcca2153d85d1a9496387fb34fa293ce..cfb72c294e384f1fc49f6ba1833cdaf732ba5f7b 100644 (file)
--- a/scripts/rev_control/rev_checkin.sh
+++ b/scripts/rev_control/rev_checkin.sh
@@ -9,6 +9,7 @@ if [ -z "$dir" ]; then
   dir=.
 fi
 
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 source "$FEISTY_MEOW_SCRIPTS/rev_control/version_control.sh"
 
 pushd "$dir" &>/dev/null

diff --git a/scripts/rev_control/rev_diff.sh b/scripts/rev_control/rev_diff.sh
index 9f04b069aeff19ae101f6ca7ecd9546be52fb38a..d74905c36734e0ffc363591de18aa5597dcde21c 100644 (file)
--- a/scripts/rev_control/rev_diff.sh
+++ b/scripts/rev_control/rev_diff.sh
@@ -9,6 +9,7 @@ if [ -z "$dir" ]; then
   dir=.
 fi
 
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 source "$FEISTY_MEOW_SCRIPTS/rev_control/version_control.sh"
 
 pushd "$dir" &>/dev/null

diff --git a/scripts/rev_control/rev_report_new.sh b/scripts/rev_control/rev_report_new.sh
index 1d0aeaad720867a32df164dd4f4ac41dbe44daf6..224b1dfb703ee4052898f0859d0e310df42b4800 100644 (file)
--- a/scripts/rev_control/rev_report_new.sh
+++ b/scripts/rev_control/rev_report_new.sh
@@ -10,6 +10,7 @@ if [ -z "$dir" ]; then
   dir=.
 fi
 
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 source "$FEISTY_MEOW_SCRIPTS/rev_control/version_control.sh"
 
 pushd "$dir" &>/dev/null

diff --git a/scripts/rev_control/rev_update.sh b/scripts/rev_control/rev_update.sh
index d4fa6e48b20842d0afac45f81d4f395814be332f..6e096279951bbde23b26f24fed54d6c1b7e18da1 100644 (file)
--- a/scripts/rev_control/rev_update.sh
+++ b/scripts/rev_control/rev_update.sh
@@ -9,6 +9,7 @@ if [ -z "$dir" ]; then
   dir=.
 fi
 
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 source "$FEISTY_MEOW_SCRIPTS/rev_control/version_control.sh"
 
 pushd "$dir" &>/dev/null

diff --git a/scripts/rev_control/svn.sh b/scripts/rev_control/svn.sh
index 056759bb3b8c342e67a3d1e4d9eb6f1a8aa30c21..63af6695062f8341c2da0a7e8e6db75368297618 100644 (file)
--- a/scripts/rev_control/svn.sh
+++ b/scripts/rev_control/svn.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ "$OPERATING_SYSTEM" = "WIN32" ]; then
-  source $FEISTY_MEOW_SCRIPTS/core/functions.sh
+  source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 
   TMP="$(dos_to_unix_path "$TMP")"
 fi

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index 560ccebcd7b15f375f06c192575c8a34d7e5a742..c41f7cdded99575cf8737ba96b1383f860867527 100644 (file)
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -3,7 +3,7 @@
 # these are helper functions for doing localized revision control.
 # this script should be sourced into other scripts that use it.
 
-source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 source "$FEISTY_MEOW_SCRIPTS/tty/terminal_titler.sh"
 
 # the maximum depth that the recursive functions will try to go below the starting directory.

diff --git a/scripts/rip_burn/checker_report.sh b/scripts/rip_burn/checker_report.sh
index 3dd649abf8a000215537bd4814b2ba5b8db2b701..bd2822c710777274fe951ff0e3f7a622391a7ad6 100644 (file)
--- a/scripts/rip_burn/checker_report.sh
+++ b/scripts/rip_burn/checker_report.sh
@@ -4,7 +4,7 @@
 # in such a way that the file count can be very high without blowing its
 # mind, and without any extra headers in the report.
 
-source $FEISTY_MEOW_SCRIPTS/core/functions.sh
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 
 dirname="$1"; shift
 outfile="$1"; shift  # optional parm.

diff --git a/scripts/security/uva_web_proxy.sh b/scripts/security/uva_web_proxy.sh
index 61fa313e27dd144d23a7862992f653e93e31db6a..9ef3b8d40c01c694661b61d375237dadddd17ec7 100644 (file)
--- a/scripts/security/uva_web_proxy.sh
+++ b/scripts/security/uva_web_proxy.sh
@@ -10,8 +10,6 @@
 
 #hmmm:  none of the user info below will work for others: parameterize it.
 
-#source $HOME/yeti/scripts/launch_feisty_meow.sh
-
 #ssh_host=khandroma.cs.virginia.edu
 ssh_host=mason.cs.virginia.edu
 

diff --git a/scripts/system/list_packages.sh b/scripts/system/list_packages.sh
index 6b3222f18e9cffcc6ef1947d46f3fa1ff5d5a36a..b4b030c2305e0f2d6a422f3da148aad5f26342ae 100644 (file)
--- a/scripts/system/list_packages.sh
+++ b/scripts/system/list_packages.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 
 if debian_like; then
   dpkg -la | grep $*

diff --git a/scripts/system/naive_system_updater.sh b/scripts/system/naive_system_updater.sh
index a68ff69236f71a15ef6f73ff6dddec2d0a5a0135..dbad94fb88203bd2c35a114578f9391fdbaa3891 100644 (file)
--- a/scripts/system/naive_system_updater.sh
+++ b/scripts/system/naive_system_updater.sh
@@ -1,6 +1,5 @@
 
-# load feisty meow aliases.
-source $HOME/feisty_meow/scripts/core/launch_feisty_meow.sh
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 
 sudo apt-get update -y
 check_result "problem while doing 'apt-get update'"

diff --git a/scripts/system/osx_cd_mounter.sh b/scripts/system/osx_cd_mounter.sh
index 7f5cc8ceea9b1dd739aec00038f99944be8c3560..22335b78e0371061a6a10df3ec690a5b1dfb734d 100644 (file)
--- a/scripts/system/osx_cd_mounter.sh
+++ b/scripts/system/osx_cd_mounter.sh
@@ -3,7 +3,7 @@
 # keeps trying to mount the cd on a mac mini to overcome
 # a new bug in itunes seen as of osx leopard upgrade.
 
-source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 
 mountpoint=/Volumes/mounty_cd
 

diff --git a/scripts/system/show_diagnostics.sh b/scripts/system/show_diagnostics.sh
index 6a21353dedf501a49e85c0211afa4918a6197661..d664e695e0f6c124780f2a6164493de36b23ab3f 100644 (file)
--- a/scripts/system/show_diagnostics.sh
+++ b/scripts/system/show_diagnostics.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 
 echo '=============='
 echo $(date_stringer | sed -e 's/_/ /g' | sed -e 's/\([0-9][0-9]\) \([0-9][0-9]\)$/:\1:\2/')

diff --git a/scripts/system/write_uptime_report.sh b/scripts/system/write_uptime_report.sh
index e9627f5ffb22e9a36a066bcd4170709e9914ed5d..0220b334dc97af5a1b47121addab1e0d0f46b877 100644 (file)
--- a/scripts/system/write_uptime_report.sh
+++ b/scripts/system/write_uptime_report.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # writes an uptime report to a file in the home directory which is named
 # after the current machine's hostname.
-source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 export hosty=$(hostname | sed -e 's/^\([^.]*\).*$/\1/')
 export REPORT_FILE="$HOME/${hosty}_uptime.log"
 echo "$(date_stringer) -- $(uptime)" >>"$REPORT_FILE" 2>&1 

diff --git a/scripts/testing/test_array_sifter.sh b/scripts/testing/test_array_sifter.sh
index 26173f193fdb6c31a2f81a2d473b0903e651b45f..b50d0818113bd9dd9e518611c90d3e1940df6f35 100644 (file)
--- a/scripts/testing/test_array_sifter.sh
+++ b/scripts/testing/test_array_sifter.sh
@@ -2,7 +2,8 @@
 #
 # tests the array sifter methods.
 
-source $FEISTY_MEOW_SCRIPTS/core/array_sifter.sh
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
+source "$FEISTY_MEOW_SCRIPTS/core/array_sifter.sh"
 
 #demo 1 & 2 for test presence.
 declare -a my_array=(peanuts sauce fish basil)

diff --git a/scripts/testing/test_time_tracker.sh b/scripts/testing/test_time_tracker.sh
index 9a908578f13a0a67e95f69b7c47bb8e35209abc0..981d32313cd67c44cf9a0ce862737c9acbd46cae 100644 (file)
--- a/scripts/testing/test_time_tracker.sh
+++ b/scripts/testing/test_time_tracker.sh
@@ -2,7 +2,8 @@
 
 # tests out the time tracking methods.
 
-source $FEISTY_MEOW_SCRIPTS/system/time_tracker.sh
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
+source "$FEISTY_MEOW_SCRIPTS/system/time_tracker.sh"
 
 echo testing time tracking...
 start_time_tracking crungle

diff --git a/scripts/testing/verify_correct_input.sh b/scripts/testing/verify_correct_input.sh
index 1cdef40cbd3c517e812b2225f18637a16a2fcdbf..9d31faa3eb7ad2bbcd7711443468936e588227ad 100644 (file)
--- a/scripts/testing/verify_correct_input.sh
+++ b/scripts/testing/verify_correct_input.sh
@@ -5,7 +5,7 @@
 
 # the single parameter to the script is a file that contains the correct answer.
 
-source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 
 answer_file="$1"; shift
 

diff --git a/scripts/tty/keep_awake_process.sh b/scripts/tty/keep_awake_process.sh
index 29a68de4ba48a56759c0d0d34065477c0c1afd91..7c32cef738a2b28c8ca5421f3617e0af3960e42e 100644 (file)
--- a/scripts/tty/keep_awake_process.sh
+++ b/scripts/tty/keep_awake_process.sh
@@ -2,7 +2,7 @@
 # This program is meant to be started by the program keep_awake and has
 # the basic guts that are meant to execute inside of a semi-perpetual loop.
 
-source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 
 # save the process id for the goodbye program to deal with.
 #echo $$ >>$TMP/trash.last_keep_awake_process

diff --git a/scripts/tty/lockup.sh b/scripts/tty/lockup.sh
index ec60e92f8f79d14c354f4dca5bda39e91586b870..efd11440364eaba9b7a5e52ac8a244bc54850571 100644 (file)
--- a/scripts/tty/lockup.sh
+++ b/scripts/tty/lockup.sh
@@ -2,7 +2,7 @@
 
 # Thanks to Kevin Wika for this shell.
 
-source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 
 trap '' HUP
 trap '' INT

diff --git a/scripts/tty/terminal_titler.sh b/scripts/tty/terminal_titler.sh
index e4262498080b5f89d688d2efbd15c2fa00985e65..329ec57c7664fc563dddba10e2f0b2c7754b0fa3 100644 (file)
--- a/scripts/tty/terminal_titler.sh
+++ b/scripts/tty/terminal_titler.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source $FEISTY_MEOW_SCRIPTS/core/functions.sh
+source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
 
 # just saying this is an array...
 #declare -a PRIOR_TERMINAL_TITLES