Merge branch 'master' into dev

diff --git a/infobase/document_templates/google_contacts_columns.ods b/infobase/document_templates/google_contacts_columns.ods
new file mode 100644 (file)
index 0000000..17e986e
Binary files /dev/null and b/infobase/document_templates/google_contacts_columns.ods differ

diff --git a/scripts/customize/fred/scripts/email/filter_grabber.sh b/scripts/customize/fred/scripts/email/filter_grabber.sh
index dcb794644d053c17003c79fcee5c230f26bbba31..8d6fe22936161d62f66df4a7a5c3561300e1d36e 100644 (file)
--- a/scripts/customize/fred/scripts/email/filter_grabber.sh
+++ b/scripts/customize/fred/scripts/email/filter_grabber.sh
@@ -7,7 +7,7 @@ source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 cp $HOME/.thunderbird/oqv30zg4.default/ImapMail/zooty.koeritz.com/msgFilterRules.dat $CLOUD_BASE/magic_cabinet/mail_filters/zooty_serene_hamstertronic_$(date_stringer).filters
 exit_on_error "copying feistymeow.org filters"
 
-cp $HOME/.thunderbird/oqv30zg4.default/ImapMail/mail.eservices.virginia.edu/msgFilterRules.dat $CLOUD_BASE/magic_cabinet/mail_filters/uva_email_$(date_stringer).filters 
-exit_on_error "copying UVa filters"
+#GONE: cp $HOME/.thunderbird/oqv30zg4.default/ImapMail/mail.eservices.virginia.edu/msgFilterRules.dat $CLOUD_BASE/magic_cabinet/mail_filters/uva_email_$(date_stringer).filters 
+#GONE: exit_on_error "copying UVa filters"
 
 

diff --git a/scripts/generator/build_variables.sh b/scripts/generator/build_variables.sh
index eb3a56605c3c60ffe6d95567b14060b91649c699..8c324acc5c61b98862fb7c4f38cf2269d1aadc17 100644 (file)
--- a/scripts/generator/build_variables.sh
+++ b/scripts/generator/build_variables.sh
@@ -208,7 +208,7 @@ if [ -z "$got_bad" ]; then
   if [ "$OPERATING_SYSTEM" == "WIN32" ]; then
     source "$BUILD_SCRIPTS_PATH/vis_stu_vars.sh"
   else
-    export LD_LIBRARY_PATH="$TARGETS_STORE"
+    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$TARGETS_STORE"
   fi
   
   popd &>/dev/null # checking is over, jump back to the starting point.

diff --git a/scripts/rev_control/diff_repos.sh b/scripts/rev_control/diff_repos.sh
index 32a5d48c6e94fc1287ff74520c9e1c5d2df054f6..5a6cf750ece71a566d1ba9f5787a1f021880e89f 100644 (file)
--- a/scripts/rev_control/diff_repos.sh
+++ b/scripts/rev_control/diff_repos.sh
@@ -25,5 +25,7 @@ popd &>/dev/null
 perform_revctrl_action_on_file "$tempfile" do_revctrl_diff
 exit_on_error "performing revision control action do_revctrl_diff on: $tempfile"
 
+rm "$tempfile"
+
 restore_terminal_title
 

diff --git a/scripts/rev_control/push_repo_downstream.sh b/scripts/rev_control/push_repo_downstream.sh
index f12fc74080918d53cf90175c7cdcbf38fc9fe010..1fc6e0ba904d351ee99218237f47fc9218c989d4 100644 (file)
--- a/scripts/rev_control/push_repo_downstream.sh
+++ b/scripts/rev_control/push_repo_downstream.sh
@@ -53,6 +53,8 @@ exit_on_error "generating revision control file list"
 perform_revctrl_action_on_file "$tempfile" do_revctrl_careful_update
 exit_on_error "doing a careful update on: $tempfile"
 
+rm "$tempfile"
+
 # seems to be needed to cause a merge to be resolved.
 git pull downstream master
 # -m "unfortunate merge"

diff --git a/scripts/rev_control/quick_git_release.sh b/scripts/rev_control/quick_git_release.sh
index 02b04a598092c77a8ef914b91eef010b05961bc8..e0c95a249faa4d9661c452d41387930dd8cf40a2 100644 (file)
--- a/scripts/rev_control/quick_git_release.sh
+++ b/scripts/rev_control/quick_git_release.sh
@@ -38,26 +38,32 @@ branch name and release tag name of the new release.
   # make up a release name based on the version number.
   local new_release="release-${new_version}"
   # make a new branch for the release based on the dev branch.
-echo about to git checkout
+echo about to git checkout--hit enter
 read line
   git checkout -b $new_release dev
   exit_on_error checking out a new branch called $new_release
   # bump feisty meow version. 
   bash ./scripts/generator/next_version.sh
   exit_on_error bumping version for feisty meow codebase
-echo about to commit
-read line
   # check in the changes in the new release branch, which now includes a revised version.
+echo about to commit--hit enter
+read line
   git commit -a
   exit_on_error committing all changes
-echo about to check out master
+
+  # not sure if we really need to check in the release branch as a remote, but we like to see it in the list.
+echo about to push new release branch--hit enter
 read line
+  git push --set-upstream origin "$new_release"
+
   # grab out the master branch as the active one.
+echo about to check out master--hit enter
+read line
   git checkout master
   exit_on_error checking out master branch
-echo about to merge
-read line
   # merge the master branch with the new release.
+echo about to merge--hit enter
+read line
   git merge --no-ff $new_release
   exit_on_error merging in the new release in master
   # let the committer see the most recent changes.
@@ -69,23 +75,23 @@ read line
   # and useful comments for what has changed in this release, gathered from the gitk that
   # we just launched.  this should include all of the work on the development branch since
   # the last release...
-echo about to TAG
+echo about to TAG--hit enter
 read line
   git tag -a $new_version
   exit_on_error tagging new version as $new_version
-echo about to commit master branch with all those changes
-read line
   # commit the full set of changes for the master branch now, including the tags.
+echo about to commit master branch with all those changes--hit enter
+read line
   rcheckin .
   exit_on_error checking in the changes in master branch
-echo switching to dev branch
-read line
   # switch back to the dev branch.
+echo switching to dev branch--hit enter
+read line
   git checkout dev
   exit_on_error checking the dev branch out again
-echo merging in from master
-read line
   # merge in the latest changes from master, which should only be the revised version really.
+echo merging in from release branch to dev--hit enter
+read line
   git merge --no-ff $new_release
   exit_on_error merging the release changes into the dev branch
   # back to where we started.

diff --git a/scripts/rev_control/rcheckin.sh b/scripts/rev_control/rcheckin.sh
index dc05cf47e1c8655461a9aea134d01d30405e2d5c..185de49e8c7a832351d4ada1a107611caa36bc44 100644 (file)
--- a/scripts/rev_control/rcheckin.sh
+++ b/scripts/rev_control/rcheckin.sh
@@ -25,4 +25,6 @@ popd &>/dev/null
 perform_revctrl_action_on_file "$tempfile" do_revctrl_checkin
 exit_on_error "doing a check-in on: $tempfile"
 
+rm "$tempfile"
+
 restore_terminal_title

diff --git a/scripts/rev_control/report_new.sh b/scripts/rev_control/report_new.sh
index 5a057b0be2f6db8f74c1432ab4726444371d5955..8ecb8715147bf32aab000474f0a4899731ba39d1 100644 (file)
--- a/scripts/rev_control/report_new.sh
+++ b/scripts/rev_control/report_new.sh
@@ -26,5 +26,7 @@ popd &>/dev/null
 perform_revctrl_action_on_file "$tempfile" do_revctrl_report_new
 exit_on_error "running revision control report"
 
+rm "$tempfile"
+
 restore_terminal_title
 

diff --git a/scripts/rev_control/rgetem.sh b/scripts/rev_control/rgetem.sh
index 529fae19b59e8e363602dd716222b1d419fc5d29..11b9edd4d7eb2bd1c61bec9f817acb10f56a69cd 100644 (file)
--- a/scripts/rev_control/rgetem.sh
+++ b/scripts/rev_control/rgetem.sh
@@ -25,5 +25,7 @@ popd &>/dev/null
 perform_revctrl_action_on_file "$tempfile" do_revctrl_simple_update
 exit_on_error "running revision control update"
 
+rm "$tempfile"
+
 restore_terminal_title
 

diff --git a/scripts/rev_control/rpuffer.sh b/scripts/rev_control/rpuffer.sh
index ddf163373ee5f4d03f69212c96f96f98497ff75a..d67332d37823b7e8ecb0e34979ba6aad630fe887 100644 (file)
--- a/scripts/rev_control/rpuffer.sh
+++ b/scripts/rev_control/rpuffer.sh
@@ -29,5 +29,7 @@ popd &>/dev/null
 perform_revctrl_action_on_file "$tempfile" do_revctrl_careful_update
 exit_on_error "puffing out repository at: $tempfile"
 
+rm "$tempfile"
+
 restore_terminal_title
 

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index 282dd4d922ff3bd9aa2708bbd34cca9760b679aa..5342ef2cc8fd672189c48bff0baf9ecfc006dec4 100644 (file)
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -156,7 +156,7 @@ function do_revctrl_diff
     svn diff .
     exit_on_error "subversion diff"
   elif [ -d ".git" ]; then
-    git diff 
+    git --no-pager diff 
     exit_on_error "git diff"
   elif [ -d "CVS" ]; then
     cvs diff .