From bc27ea39ae97dd046a969eafa4965b181d0c2452 Mon Sep 17 00:00:00 2001
From: Michael Nygard <mtnygard@gmail.com>
Date: Sat, 22 Feb 2014 11:44:05 -0600
Subject: [PATCH 01/13] Still fiddling

---
 bash/bash_extra_rc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bash/bash_extra_rc b/bash/bash_extra_rc
index a3ca7a7..503b411 100644
--- a/bash/bash_extra_rc
+++ b/bash/bash_extra_rc
@@ -1,5 +1,5 @@
 # Relevance "etc" scripts
-B="~/opensource/etc/bash"
+B=~/opensource/etc/bash
 
 if [ -d $B ]; then
     source $B/git.sh

From c505022495f7fb7d384023512d2dd2ae086137dc Mon Sep 17 00:00:00 2001
From: Sam Moore <nortonstreet@thinkrelevance.com>
Date: Mon, 24 Feb 2014 09:43:19 -0500
Subject: [PATCH 02/13] Added Carin Meier (cm)

---
 scripts/pair | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/pair b/scripts/pair
index 6a7e143..60b4622 100755
--- a/scripts/pair
+++ b/scripts/pair
@@ -22,7 +22,8 @@ AUTHORS = {
   "bc" => "Bobby Calderwood",
   "bv" => "Ben Vandgrift",
   "ca" => "Craig Andera",
-  "cd" => "Clinton Dreisbach",
+  "cd" => "Clinton Dreisbach",  
+  "cm" => "Carin Meier",
   "cr" => "Chris Redinger",
   "dc" => "David Chelimsky",
   "dm" => "Daemian Mack",

From d9923d84df0c2a99fb23b78ce754b4bf6b3af952 Mon Sep 17 00:00:00 2001
From: Sam Moore <nortonstreet@thinkrelevance.com>
Date: Mon, 14 Apr 2014 11:58:58 -0400
Subject: [PATCH 03/13] Added Jan Herich

---
 scripts/pair | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/pair b/scripts/pair
index 60b4622..d9877d8 100755
--- a/scripts/pair
+++ b/scripts/pair
@@ -31,6 +31,7 @@ AUTHORS = {
   "gs" => "Ghadi Shayban",
   "jd" => "Jon Distad",
   "jg" => "Justin Gehtland",
+  "jh" => "Jan Herich",
   "jk" => "Jamie Kite",
   "jm" => "Jen Myers",
   "jam" => "Jen Myers",

From 3f75b1e6eda02e25325178b7f3e28b5bd003026c Mon Sep 17 00:00:00 2001
From: Sam Moore <nortonstreet@thinkrelevance.com>
Date: Mon, 28 Apr 2014 09:38:12 -0400
Subject: [PATCH 04/13] Added David Nolen

---
 scripts/pair | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/pair b/scripts/pair
index d9877d8..ca35b2b 100755
--- a/scripts/pair
+++ b/scripts/pair
@@ -27,6 +27,7 @@ AUTHORS = {
   "cr" => "Chris Redinger",
   "dc" => "David Chelimsky",
   "dm" => "Daemian Mack",
+  "dn" => "David Nolen",
   "gh" => "Gabriel Horner",
   "gs" => "Ghadi Shayban",
   "jd" => "Jon Distad",

From 6608bf7a08c4656a2a655757abb093df7fe11387 Mon Sep 17 00:00:00 2001
From: Sam Moore <nortonstreet@thinkrelevance.com>
Date: Mon, 2 Jun 2014 11:20:13 -0400
Subject: [PATCH 05/13] Added Ben Kamphaus

---
 scripts/pair | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/pair b/scripts/pair
index ca35b2b..03eddf1 100755
--- a/scripts/pair
+++ b/scripts/pair
@@ -20,6 +20,7 @@ AUTHORS = {
   "ba" => "Brenton Ashworth",
   "bb" => "Brandon Bloom",
   "bc" => "Bobby Calderwood",
+  "bk" => "Ben Kamphaus",
   "bv" => "Ben Vandgrift",
   "ca" => "Craig Andera",
   "cd" => "Clinton Dreisbach",  

From 0fa30120c2473de4b6336c83a8a3551caa28335f Mon Sep 17 00:00:00 2001
From: Relevance Pair <pair@thinkrelevance.com>
Date: Sat, 14 Jun 2014 17:38:39 +0000
Subject: [PATCH 06/13] Put the 'pair' script on path

---
 bash/bash_extra_rc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bash/bash_extra_rc b/bash/bash_extra_rc
index 503b411..2a8f883 100644
--- a/bash/bash_extra_rc
+++ b/bash/bash_extra_rc
@@ -11,7 +11,7 @@ if [ -d $B ]; then
 fi
 
 # Local executables
-export PATH=$HOME/bin:$PATH
+export PATH=$HOME/bin:$HOME/opensource/etc/scripts:$PATH
 
 # Pairhost aliases
 alias sourcecode="truecrypt -t -k '' --protect-hidden=no $HOME/sourcecode.tc $HOME/src"

From f2179c545e8c400a436f3ce39f7a75da3ce8bb29 Mon Sep 17 00:00:00 2001
From: Michael Nygard <pair+mn@cognitect.com>
Date: Sat, 14 Jun 2014 17:52:09 +0000
Subject: [PATCH 07/13] Make shift-arrow keys work in tmux

---
 tmux.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tmux.conf b/tmux.conf
index f653a36..630b57f 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -1,5 +1,5 @@
 # Work nicely with emacs key combos
-set -g default-terminal "screen-256color"
+set -g default-terminal "xterm-256color"
 set-window-option -g xterm-keys on
 
 # Bind <C-q> to leader

From 0095ee08ac31ea3a6d795ed3a8e5599e0f5e8827 Mon Sep 17 00:00:00 2001
From: Sam Moore <nortonstreet@thinkrelevance.com>
Date: Fri, 19 Sep 2014 10:20:41 -0400
Subject: [PATCH 08/13] Added Jeb Beich

---
 scripts/pair | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/pair b/scripts/pair
index 03eddf1..74d609a 100755
--- a/scripts/pair
+++ b/scripts/pair
@@ -31,6 +31,7 @@ AUTHORS = {
   "dn" => "David Nolen",
   "gh" => "Gabriel Horner",
   "gs" => "Ghadi Shayban",
+  "jb" => "Jeb Beich",
   "jd" => "Jon Distad",
   "jg" => "Justin Gehtland",
   "jh" => "Jan Herich",

From 78b1fa8aeb8d5e5ea215e8bdcfa2519398b6c452 Mon Sep 17 00:00:00 2001
From: Sam Moore <nortonstreet@thinkrelevance.com>
Date: Mon, 22 Sep 2014 10:50:27 -0400
Subject: [PATCH 09/13] Added Philipp Meier

---
 scripts/pair | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/pair b/scripts/pair
index 74d609a..8a60fd4 100755
--- a/scripts/pair
+++ b/scripts/pair
@@ -53,6 +53,7 @@ AUTHORS = {
   "mp" => "Michael Parenteau",
   "nm" => "Nelson Morris",
   "pd" => "Paul deGrandis",
+  "pm" => "Philipp Meier",
   "rh" => "Rich Hickey",
   "rn" => "Ryan Neufeld",
   "ro" => "Russ Olsen",

From c79bd2f92e89515203a0db428d6884b7ee96056b Mon Sep 17 00:00:00 2001
From: Ben Vandgrift and Russ Olsen <pair+bv+ro@cognitect.com>
Date: Tue, 18 Nov 2014 20:06:38 +0000
Subject: [PATCH 10/13] add mount and umount scripts for dm-crypt

---
 scripts/mountsrc  | 32 ++++++++++++++++++++++++++++++++
 scripts/umountsrc | 27 +++++++++++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100755 scripts/mountsrc
 create mode 100755 scripts/umountsrc

diff --git a/scripts/mountsrc b/scripts/mountsrc
new file mode 100755
index 0000000..3d5e12b
--- /dev/null
+++ b/scripts/mountsrc
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+# usage: mountsrc [cryptfile] [mount dir]
+
+CRYPTFILE=$1
+: ${CRYPTFILE:="/home/pair/sourcecode.tc"}
+
+MOUNTDIR=$2
+: ${MOUNTDIR:="/home/pair/src"}
+
+
+# check for sudo
+if [ `whoami` != "root" ]
+then 
+  echo "You should really run this as root." 
+  exit 1
+fi
+
+# make the dir if it doesn't exist
+if ! [ -d $MOUNTDIR ]
+then
+  echo "Creating mount point $MOUNTDIR."
+  sudo -u pair mkdir $MOUNTDIR
+fi
+  
+# the heavy lifting
+
+echo "Mounting source $CRYPTFILE to $MOUNTDIR."
+DEV=`losetup -f`
+losetup $DEV $CRYPTFILE
+cryptsetup luksOpen $DEV src
+mount -t ext4 /dev/mapper/src $MOUNTDIR
diff --git a/scripts/umountsrc b/scripts/umountsrc
new file mode 100755
index 0000000..bda74a4
--- /dev/null
+++ b/scripts/umountsrc
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+# usage: umountsrc [cryptfile] [mount dir]
+
+# check for sudo
+if [ `whoami` != "root" ]
+then 
+  echo "You should really run this as root." 
+  exit 1
+fi
+
+CRYPTFILE=$1
+: ${CRYPTFILE:="/home/pair/sourcecode.tc"}
+
+MOUNTDIR=$2
+: ${MOUNTDIR:="/home/pair/src"}
+
+echo "Dismounting source code volume $CRYPTFILE from $MOUNTDIR"
+
+umount $MOUNTDIR
+cryptsetup luksClose src
+for lodevice in `sudo losetup  -j $CRYPTFILE  | awk -F ':' ' { print $1 } '` 
+do 
+  # we remove the loopback binding for each device
+  losetup -d $lodevice 
+done
+

From 8ba283ce77d6b5895c7bfffedb98d59b4d4b446b Mon Sep 17 00:00:00 2001
From: Norton Street <support@nortonstreet.biz>
Date: Mon, 1 Jun 2015 15:21:15 -0400
Subject: [PATCH 11/13] Added Carin Meier

Added Carin Meier
---
 scripts/pair | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/pair b/scripts/pair
index 8a60fd4..359d630 100755
--- a/scripts/pair
+++ b/scripts/pair
@@ -22,6 +22,7 @@ AUTHORS = {
   "bc" => "Bobby Calderwood",
   "bk" => "Ben Kamphaus",
   "bv" => "Ben Vandgrift",
+  "cm" => "Carin Meier",
   "ca" => "Craig Andera",
   "cd" => "Clinton Dreisbach",  
   "cm" => "Carin Meier",

From f6a12600df4dfc24f5c50ff5097d6e8c2a6d9d94 Mon Sep 17 00:00:00 2001
From: Sam Umbach <samumbach@gmail.com>
Date: Thu, 17 Sep 2015 09:56:05 -0400
Subject: [PATCH 12/13] Add Bobby Norton

---
 scripts/pair | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/pair b/scripts/pair
index 359d630..ff4cce3 100755
--- a/scripts/pair
+++ b/scripts/pair
@@ -21,6 +21,7 @@ AUTHORS = {
   "bb" => "Brandon Bloom",
   "bc" => "Bobby Calderwood",
   "bk" => "Ben Kamphaus",
+  "bn" => "Bobby Norton",
   "bv" => "Ben Vandgrift",
   "cm" => "Carin Meier",
   "ca" => "Craig Andera",

From dc8518237582a22ff65bd05e4cc2251d6ec7244b Mon Sep 17 00:00:00 2001
From: Michael Nygard <mtnygard@gmail.com>
Date: Tue, 2 Aug 2016 13:25:15 -0500
Subject: [PATCH 13/13] Update for 'git status' output change.

---
 bash/git_prompt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bash/git_prompt.sh b/bash/git_prompt.sh
index 2e69e5a..4acfdbb 100644
--- a/bash/git_prompt.sh
+++ b/bash/git_prompt.sh
@@ -18,7 +18,7 @@ function git_branch_and_user {
   branch_pattern="^On branch ([^${IFS}]*)"
   remote_pattern="Your branch is (.*) of"
   diverge_pattern="Your branch and (.*) have diverged"
-  if [[ ! ${git_status} =~ "working directory clean" ]]; then
+  if [[ ! ${git_status} =~ "working tree clean" ]]; then
     state=" ${RED}⚡"
   else
     state=""