From: Chris Koeritz Date: Thu, 2 Feb 2012 23:54:43 +0000 (-0500) Subject: added pbs protection to keep scripts from running. X-Git-Tag: 2.140.90~1646 X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=b797d90a8292bca762aa9adabf0f76989b04b1fe;p=feisty_meow.git added pbs protection to keep scripts from running. --- diff --git a/scripts/examples/feisty_meow_startup/bashrc_user b/scripts/examples/feisty_meow_startup/bashrc_user index 1877a58e..6c2b67f9 100644 --- a/scripts/examples/feisty_meow_startup/bashrc_user +++ b/scripts/examples/feisty_meow_startup/bashrc_user @@ -11,8 +11,9 @@ # export NAME='Doodmodeus Q. Nornberton' # don't bother running our stuff for a dumb terminal since any echo -# can mess with an sftp connection, apparently. -if [ ${TERM} != "dumb" ]; then +# can mess with an sftp or scp connection, apparently. similarly, we +# don't want any automatic startup stuff if we are running under PBS. +if [ "${TERM}" != "dumb" -a -z "$PBS_ENVIRONMENT" ]; then # sets up the feisty_meow scripts, using the default locations for all scripts. source $HOME/feisty_meow/scripts/core/launch_feisty_meow.sh fi diff --git a/scripts/examples/feisty_meow_startup/bashrc_user_windoz b/scripts/examples/feisty_meow_startup/bashrc_user_windoz index f2c32ddb..46dce184 100644 --- a/scripts/examples/feisty_meow_startup/bashrc_user_windoz +++ b/scripts/examples/feisty_meow_startup/bashrc_user_windoz @@ -15,9 +15,8 @@ # add in some useful paths for the local machine. export PATH=/bin:$PATH:/c/utilities/emacs-23.2/bin:/c/tools/cvsnt:/c/utilities/Vim/vim71:/c/system/Perl/site/bin:/c/system/Perl/bin:/c/tools/doxygen/bin:/c/tools/graphviz/Graphviz/bin -#export FEISTY_MEOW_DIR="$HOME/feisty_meow" - -# sets up the feisty_meow scripts, using the default locations for all scripts. -source $HOME/feisty_meow/scripts/core/launch_feisty_meow.sh +if [ "${TERM}" != "dumb" -a -z "$PBS_ENVIRONMENT" ]; then + source $HOME/feisty_meow/scripts/core/launch_feisty_meow.sh +fi