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 into dev
[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 a71d61ae35b011fc1287e95932df2057322d89a8..4c9c0d90d2c8bb63088454bf258653760d3a83a8 100644
(file)
--- a/
scripts/customize/fred/fred_variables.sh
+++ b/
scripts/customize/fred/fred_variables.sh
@@
-15,7
+15,7
@@
if [ -z "$USER_CUSTOMIZATIONS_LOADED" ]; then
fi
# add a bunch of personal folders to the list for checkin & checkout.
fi
# add a bunch of personal folders to the list for checkin & checkout.
- REPOSITORY_LIST+="
$(basename $FEISTY_MEOW_APEX) cloud ebooks web active/webwork
"
+ REPOSITORY_LIST+="
cloud ebooks web
"
# 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"
# 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"
@@
-38,15
+38,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,