X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcustomize%2Ffred%2Ffred_variables.sh;h=4c9c0d90d2c8bb63088454bf258653760d3a83a8;hb=7b39f7e279005c8466ef508220a532ce2aa4abf8;hp=e53f9b5b11600ea368b511f80c0699c4d1f83c0b;hpb=649014ac617023bc07835be770fb6bfa03c9e301;p=feisty_meow.git diff --git a/scripts/customize/fred/fred_variables.sh b/scripts/customize/fred/fred_variables.sh index e53f9b5b..4c9c0d90 100644 --- a/scripts/customize/fred/fred_variables.sh +++ b/scripts/customize/fred/fred_variables.sh @@ -15,18 +15,7 @@ if [ -z "$USER_CUSTOMIZATIONS_LOADED" ]; then fi # add a bunch of personal folders to the list for checkin & checkout. - REPOSITORY_LIST+="cloud ebooks web" - # add in any active projects. - if [ -d "$HOME/active" ]; then - REPOSITORY_LIST+="$(find "$HOME/active" -maxdepth 1 -mindepth 1 -type d)" - fi - # add in any of my applications that are in the apps folder. - if [ -d "$HOME/apps" ]; then - # first, simple projects. - REPOSITORY_LIST+="$(find "$HOME/apps" -maxdepth 1 -mindepth 1 -type d)" - # then, site avenger specific projects. - REPOSITORY_LIST+="$(find "$HOME/apps" -maxdepth 2 -mindepth 2 -iname "avenger5" -type d)" - fi + 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" @@ -49,15 +38,21 @@ if [ -z "$USER_CUSTOMIZATIONS_LOADED" ]; then # 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 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,