From 88a4dcce8283a35723c94386b974a543852b77dc Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Sat, 4 Feb 2017 13:04:48 -0500 Subject: [PATCH] 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. --- examples/legacy/gpg-daemon-launcher.sh | 2 +- infobase/configuration/trac/trac_startup.sh | 2 +- scripts/archival/pack_feisty_meow.sh | 2 +- scripts/buildor/buildor_make_code_writable.sh | 3 ++- scripts/buildor/buildor_strip_code.sh | 1 + scripts/buildor/find_one_word_comments.sh | 1 + scripts/buildor/refresh_gffs_build.sh | 3 ++- scripts/buildor/stdbuild.sh | 2 +- scripts/core/functions.sh | 4 ++-- scripts/core/inventory.sh | 2 +- scripts/core/launch_feisty_meow.sh | 4 ++-- scripts/core/search_replace.sh | 2 +- scripts/core/variables.sh | 2 +- scripts/customize/fred/scripts/gamesaver.sh | 2 +- scripts/customize/fred/scripts/musical_wand.sh | 2 +- scripts/customize/fred/scripts/sftp.sh | 1 + scripts/customize/fred/scripts/ssh.sh | 1 + scripts/customize/fred/scripts/update_soapbox.sh | 2 +- scripts/email/move_spams_and_check.sh | 2 +- scripts/files/squish_directories.sh | 2 +- scripts/generator/build_variables.sh | 2 +- scripts/generator/wrapdoze.sh | 2 +- scripts/makefile | 2 +- scripts/multimedia/sound_play.sh | 2 +- scripts/opensim/backup_opensim.sh | 2 +- scripts/opensim/backup_osgrid.sh | 2 +- scripts/opensim/maybe_restart_opensim.sh | 3 ++- scripts/opensim/opensim_utils.sh | 2 +- scripts/opensim/run_opensim.sh | 3 ++- scripts/opensim/run_osgrid.sh | 3 ++- scripts/opensim/stop_opensim.sh | 3 ++- scripts/opensim/stop_osgrid.sh | 3 ++- scripts/processes/goodbye.sh | 2 +- scripts/processes/pskill.sh | 2 +- scripts/processes/show_hot_ones.sh | 2 +- scripts/rev_control/checkin.sh | 2 +- scripts/rev_control/getem.sh | 2 +- scripts/rev_control/rev_checkin.sh | 1 + scripts/rev_control/rev_diff.sh | 1 + scripts/rev_control/rev_report_new.sh | 1 + scripts/rev_control/rev_update.sh | 1 + scripts/rev_control/svn.sh | 2 +- scripts/rev_control/version_control.sh | 2 +- scripts/rip_burn/checker_report.sh | 2 +- scripts/security/uva_web_proxy.sh | 2 -- scripts/system/list_packages.sh | 2 +- scripts/system/naive_system_updater.sh | 3 +-- scripts/system/osx_cd_mounter.sh | 2 +- scripts/system/show_diagnostics.sh | 2 +- scripts/system/write_uptime_report.sh | 2 +- scripts/testing/test_array_sifter.sh | 3 ++- scripts/testing/test_time_tracker.sh | 3 ++- scripts/testing/verify_correct_input.sh | 2 +- scripts/tty/keep_awake_process.sh | 2 +- scripts/tty/lockup.sh | 2 +- scripts/tty/terminal_titler.sh | 2 +- 56 files changed, 66 insertions(+), 52 deletions(-) diff --git a/examples/legacy/gpg-daemon-launcher.sh b/examples/legacy/gpg-daemon-launcher.sh index 89054055..f59c6d1f 100644 --- 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 87c5668c..7326c815 100644 --- 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 67a52bf9..f98c004a 100644 --- 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 494159d0..dfc88532 100644 --- 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 0d0dbed0..dc03704a 100644 --- 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 bfd95ade..cefa1a9d 100644 --- 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 a5b0c1b9..22118795 100644 --- 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 a084d3b1..13fd1fd9 100644 --- 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 86d89991..67c58455 100644 --- 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 2f58c54c..e2290d5a 100644 --- 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 70b1b0ca..db00c382 100644 --- 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 9825c6ca..8357761a 100644 --- 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 bd11c465..9cecadf8 100644 --- 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 0cd6b725..1e5ea9ca 100644 --- 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 e25a4707..37dccc87 100644 --- 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 c668500c..8753ac47 100644 --- 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 3c77a5ac..0c7897c4 100644 --- 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 df5921c0..90a0e0b0 100644 --- 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 e4bfd43a..0902a35c 100644 --- 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 e19bf97f..8682e30d 100644 --- 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 e30bd079..18f402f7 100644 --- 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 c28d0e72..99f05ef9 100755 --- 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 773fea68..a660a707 100644 --- 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 2110a4b6..962efd61 100644 --- 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 7974f0d8..892a13e4 100644 --- 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 865ca4d8..959aabf4 100644 --- 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 dc8a4b2a..f6d5e7a4 100644 --- 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 c45ab0de..695c09cf 100644 --- 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 04499bdb..674786f9 100644 --- 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 2d1d7752..b03f62b1 100644 --- 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 7bdad6f3..9b885e35 100644 --- 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 8a3cf900..036e5841 100644 --- 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 674a1197..99501f10 100644 --- 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 a9fb3815..31e119f8 100644 --- 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 1ac279f0..786bf174 100644 --- 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 78d03065..76e0c7f0 100644 --- 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 983ba787..ace37be8 100644 --- 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 808f21a7..cfb72c29 100644 --- 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 9f04b069..d74905c3 100644 --- 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 1d0aeaad..224b1dfb 100644 --- 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 d4fa6e48..6e096279 100644 --- 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 056759bb..63af6695 100644 --- 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 560ccebc..c41f7cdd 100644 --- 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 3dd649ab..bd2822c7 100644 --- 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 61fa313e..9ef3b8d4 100644 --- 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 6b3222f1..b4b030c2 100644 --- 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 a68ff692..dbad94fb 100644 --- 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 7f5cc8ce..22335b78 100644 --- 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 6a21353d..d664e695 100644 --- 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 e9627f5f..0220b334 100644 --- 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 26173f19..b50d0818 100644 --- 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 9a908578..981d3231 100644 --- 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 1cdef40c..9d31faa3 100644 --- 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 29a68de4..7c32cef7 100644 --- 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 ec60e92f..efd11440 100644 --- 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 e4262498..329ec57c 100644 --- 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 -- 2.34.1