update for new name of cloud = nuage

[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 1906df4f410d5c691d22e1f2bdc0ed42702204d1..36bee1e1cac0be0cb52ef5db6114af3a4b66eff4 100644 (file)
--- a/scripts/customize/fred/fred_variables.sh
+++ b/scripts/customize/fred/fred_variables.sh
@@ -4,20 +4,22 @@
 if [ -z "$USER_CUSTOMIZATIONS_LOADED" ]; then
   # if we don't see the nethack variable defined, this probably hasn't run yet.
 
-  # The cloud directory is our new repository that's always available.  It serves as our
-  # personal cloud for data.
-  export CLOUD_BASE=$HOME/cloud
+  # The nuage directory is a cloud-like repository of our personal data, managed as a git repo.
+  export CLOUD_BASE=$HOME/nuage
 
   # 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 folders to the list for checkin & checkout.  these are
-  # definitely personal, and some of them are fairly dated (the yeti and
-  # hoople folders, for example).
-  REPOSITORY_LIST+="cloud ebooks web active/webwork"
+  # add a bunch of personal folders to the list for checkin & checkout.
+  REPOSITORY_LIST=" nuage ebooks web ${REPOSITORY_LIST} "
+
+  # adds our locally relevant archive folders into the list to be synched.
+  MAJOR_ARCHIVE_SOURCES+="/z/archons /z/basement /z/imaginations /z/musix /z/toaster /z/walrus $HOME/brobdingnag"
+  # 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"
@@ -37,15 +39,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,