projects
/
feisty_meow.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5b23fa1
)
cleaning and improvements
author
Chris Koeritz
<fred@gruntose.com>
Sun, 12 Nov 2017 05:17:21 +0000
(
00:17
-0500)
committer
Chris Koeritz
<fred@gruntose.com>
Sun, 12 Nov 2017 05:17:21 +0000
(
00:17
-0500)
infobase/configuration/cron/aa_cron_defaults.crontab
patch
|
blob
|
history
infobase/feisty_inits/dot.bashrc-normal-user
patch
|
blob
|
history
infobase/feisty_inits/dot.bashrc-root
patch
|
blob
|
history
scripts/core/launch_feisty_meow.sh
patch
|
blob
|
history
diff --git
a/infobase/configuration/cron/aa_cron_defaults.crontab
b/infobase/configuration/cron/aa_cron_defaults.crontab
index 51a73ff46d2a617a2437ec106d33ab7450f11fc9..c8ff3ebe422c2f76cdf9750b78311ab9763181c0 100644
(file)
--- a/
infobase/configuration/cron/aa_cron_defaults.crontab
+++ b/
infobase/configuration/cron/aa_cron_defaults.crontab
@@
-23,7
+23,6
@@
SHELL=/bin/bash
# almost nothing from the user's environment. this folder needs to be updated
# for your own particular install location.
FEISTY_MEOW_APEX=/opt/feistymeow.org/feisty_meow
# almost nothing from the user's environment. this folder needs to be updated
# for your own particular install location.
FEISTY_MEOW_APEX=/opt/feistymeow.org/feisty_meow
-#FEISTY_MEOW_APEX=$HOME/feisty_meow
# crontab miniature docs:
#
# crontab miniature docs:
#
diff --git
a/infobase/feisty_inits/dot.bashrc-normal-user
b/infobase/feisty_inits/dot.bashrc-normal-user
index edc83b709a74838dba2be900710ec189e7109121..615970aa422bc56e1a333c0e38a10f6eef792bc7 100644
(file)
--- a/
infobase/feisty_inits/dot.bashrc-normal-user
+++ b/
infobase/feisty_inits/dot.bashrc-normal-user
@@
-19,10
+19,8
@@
export HISTFILESIZE=8000000
##############
##############
-# system-wide install:
+# system-wide install
(will be fixed by connect_feisty_meow script)
:
export FEISTY_MEOW_APEX="/opt/feistymeow.org/feisty_meow"
export FEISTY_MEOW_APEX="/opt/feistymeow.org/feisty_meow"
-# personal install:
-#export FEISTY_MEOW_APEX="$HOME/feisty_meow"
# sets up the feisty_meow scripts if appropriate for the environment.
if [ "${TERM}" != "dumb" -a -z "$PBS_ENVIRONMENT" ]; then
# sets up the feisty_meow scripts if appropriate for the environment.
if [ "${TERM}" != "dumb" -a -z "$PBS_ENVIRONMENT" ]; then
diff --git
a/infobase/feisty_inits/dot.bashrc-root
b/infobase/feisty_inits/dot.bashrc-root
index 1b1dd1e23b279db6c64416b4c609fee2fd0c843f..453a0fbd472e64b4557e61728850842eb2dd7cc5 100644
(file)
--- a/
infobase/feisty_inits/dot.bashrc-root
+++ b/
infobase/feisty_inits/dot.bashrc-root
@@
-19,10
+19,8
@@
export HISTFILESIZE=8000000
##############
##############
-# system-wide install:
+# system-wide install
(will be fixed by connect_feisty_meow script)
:
export FEISTY_MEOW_APEX="/opt/feistymeow.org/feisty_meow"
export FEISTY_MEOW_APEX="/opt/feistymeow.org/feisty_meow"
-# personal install:
-#export FEISTY_MEOW_APEX="$HOME/feisty_meow"
# the "fredme" macro enables the feisty_meow environment.
alias fredme='source "$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh"'
# the "fredme" macro enables the feisty_meow environment.
alias fredme='source "$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh"'
diff --git
a/scripts/core/launch_feisty_meow.sh
b/scripts/core/launch_feisty_meow.sh
index 241e2a0f1be5f39093c916515594bedf33c98bc7..a9db25b406c23e37b5f6275c86f975df640a37c4 100644
(file)
--- a/
scripts/core/launch_feisty_meow.sh
+++ b/
scripts/core/launch_feisty_meow.sh
@@
-67,7
+67,7
@@
runs. Check \$HOME/.bashrc to see if a change there will fix the problem.
"
else
# apex is good, so let's make the scripts good too.
"
else
# apex is good, so let's make the scripts good too.
- if [ ! -d "$FEISTY_MEOW_SCRIPTS" ]; then
+ if [
-z "$FEISTY_MEOW_SCRIPTS" -o
! -d "$FEISTY_MEOW_SCRIPTS" ]; then
export FEISTY_MEOW_SCRIPTS="$FEISTY_MEOW_APEX/scripts"
fi
# check again to test our belief system...
export FEISTY_MEOW_SCRIPTS="$FEISTY_MEOW_APEX/scripts"
fi
# check again to test our belief system...
@@
-77,11
+77,6
@@
else
fi
fi
fi
fi
-#; /bin/bash -i --norc --noprofile\" > \$HOME/fm-fix
-#; exec /bin/bash -i --norc --noprofile -c 'bash \$HOME/fm-fix ; echo hello ; read line'
-#--norc --noprofile
-#; source \$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh
-
if [ "$NO_REPAIRS_NEEDED" == "true" ]; then
# we believe it's safe to run through the rest of this script.
if [ "$NO_REPAIRS_NEEDED" == "true" ]; then
# we believe it's safe to run through the rest of this script.