projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of feistymeow.org:feisty_meow
[feisty_meow.git]
/
scripts
/
customize
/
fred
/
fred_variables.sh
diff --git
a/scripts/customize/fred/fred_variables.sh
b/scripts/customize/fred/fred_variables.sh
index 2d2e77ab7e9d7acf7a9e86aae6db0ce3f719f3d6..1ac9756abbc9664281e3ea8ea3e016279dfacea1 100644
(file)
--- a/
scripts/customize/fred/fred_variables.sh
+++ b/
scripts/customize/fred/fred_variables.sh
@@
-10,16
+10,17
@@
if [ -z "$USER_CUSTOMIZATIONS_LOADED" ]; then
# The gruntose web site is expected to reside below, if it exists at all.
export WEBBED_SITES=$HOME/web
# The gruntose web site is expected to reside below, if it exists at all.
export WEBBED_SITES=$HOME/web
- if [ "$(hostname)" = "
zooty.koeritz.com
" ]; then
+ if [ "$(hostname)" = "
hamstertronic
" ]; then
export WEBBED_SITES=/var/www
fi
# add a bunch of personal folders to the list for checkin & checkout.
export WEBBED_SITES=/var/www
fi
# add a bunch of personal folders to the list for checkin & checkout.
- REPOSITORY_LIST+="cloud ebooks web"
- REPOSITORY_LIST+="$(find $HOME/active -maxdepth 1 -mindepth 1 -type d)"
+ REPOSITORY_LIST+=" cloud ebooks web "
# adds our locally relevant archive folders into the list to be synched.
# adds our locally relevant archive folders into the list to be synched.
- ARCHIVE_COLLECTIONS_LIST+="/z/basement /z/imaginations /z/musix /z/toaster /z/walrus"
+ MAJOR_ARCHIVE_SOURCES+="/z/archons /z/basement /z/imaginations /z/musix /z/toaster /z/walrus"
+ # our set of known source hierarchy folder names.
+ SOURCECODE_HIERARCHY_LIST="codebarn extra_brain interbrane"
# point to our local certificate for ssh usage.
export SVN_SSH="ssh -i $HOME/.ssh/id_dsa_sourceforge"
# point to our local certificate for ssh usage.
export SVN_SSH="ssh -i $HOME/.ssh/id_dsa_sourceforge"
@@
-39,15
+40,21
@@
if [ -z "$USER_CUSTOMIZATIONS_LOADED" ]; then
# export BROWSER=/usr/bin/firefox
# editor and other mixed settings...
# export BROWSER=/usr/bin/firefox
# editor and other mixed settings...
- export EDITOR="$(which vim)"
+ export EDITOR="$(which gvim)"
+ if [ -z "$EDITOR" ]; then
+ export EDITOR="$(which vim)"
+ else
+ # special case for gvim; tell it not to fork or we can't wait for it.
+ EDITOR+=" --nofork"
+ fi
if [ -z "$EDITOR" ]; then
EDITOR="$(which vi)"
if [ -z "$EDITOR" ]; then
EDITOR="$(which vi)"
- if [ -z "$EDITOR" ]; then
- EDITOR="$(which emacs)"
- if [ -z "$EDITOR" ]; then
- echo "Cannot find a friendly editor."
- fi
- fi
+ fi
+ if [ -z "$EDITOR" ]; then
+ EDITOR="$(which emacs)"
+ fi
+ if [ -z "$EDITOR" ]; then
+ echo "Cannot find a friendly editor."
fi
export VISUAL="$EDITOR"
# the editors for revision control must wait while document is edited,
fi
export VISUAL="$EDITOR"
# the editors for revision control must wait while document is edited,