From 1e9c2fdf6f8072002ef775a72c794170a7cea915 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Tue, 27 Nov 2012 00:12:43 -0500
Subject: largely redo my bash config

---
 .config/bash/aliases.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to '.config/bash/aliases.sh')

diff --git a/.config/bash/aliases.sh b/.config/bash/aliases.sh
index 8241b95..f47bf4c 100644
--- a/.config/bash/aliases.sh
+++ b/.config/bash/aliases.sh
@@ -53,7 +53,6 @@ unset redshift
 ######################################################################
 # Some almost-function aliases                                       #
 ######################################################################
-xterm-title() { echo "];$@"; } # Oh, wait this one *is* a function
 alias lock="clear; away -C 'This terminal is locked'"
-alias plock="xterm-title Terminal Locked;lock"
+alias plock="term-title Terminal Locked;lock"
 mvln() { mv $1 $2; ln -s $2 $1; }
-- 
cgit v1.2.3-54-g00ecf


From f2282f6cc0011fc761986c0e3b4e3735d4629e81 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sat, 26 Jan 2013 22:02:06 -0500
Subject: avoid bug in sed 4.2.2

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

(limited to '.config/bash/aliases.sh')

diff --git a/.config/bash/aliases.sh b/.config/bash/aliases.sh
index f47bf4c..0964a83 100644
--- a/.config/bash/aliases.sh
+++ b/.config/bash/aliases.sh
@@ -37,7 +37,7 @@ alias l='ls -CF'
 ######################################################################
 #alias rm='gvfs-trash'
 alias ssh='ssh -XC'
-alias sed='sed --follow-symlinks'
+#alias sed='sed --follow-symlinks' # breaks sed 4.2.2
 alias tree='tree --charset utf8'
 alias cd=pushd
 alias gitk='gitk --all --date-order'
-- 
cgit v1.2.3-54-g00ecf


From 61471be038223fc8610eb75ea8381a6237ae8b6c Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Mon, 8 Apr 2013 10:05:34 -0400
Subject: use tabs in .config/bash/aliases.sh

---
 .config/bash/aliases.sh | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to '.config/bash/aliases.sh')

diff --git a/.config/bash/aliases.sh b/.config/bash/aliases.sh
index 0964a83..3f39107 100644
--- a/.config/bash/aliases.sh
+++ b/.config/bash/aliases.sh
@@ -6,23 +6,23 @@
 # Set up colors and settings for ls/dir/vdir                         #
 ######################################################################
 if [ -x "`which dircolors`" ]; then
-    eval "`dircolors -b`"
-    alias ls='ls -1v --color=auto'
-    alias dir='dir -v --color=auto'
-    alias vdir='vdir -v--color=auto'
+	eval "`dircolors -b`"
+	alias ls='ls -1v --color=auto'
+	alias dir='dir -v --color=auto'
+	alias vdir='vdir -v--color=auto'
 
-    for xgrep in ${PATH//:/\/*grep }/*grep; do
-        if [ -f "$xgrep" ]; then
-            xgrep=`basename "$xgrep"`
-	    if [ "$xgrep" != pgrep ]; then
-		alias $xgrep="$xgrep --color=auto"
-	    fi
-        fi
-    done
+	for xgrep in ${PATH//:/\/*grep }/*grep; do
+		if [ -f "$xgrep" ]; then
+			xgrep=`basename "$xgrep"`
+			if [ "$xgrep" != pgrep ]; then
+				alias $xgrep="$xgrep --color=auto"
+			fi
+		fi
+	done
 else
-    alias ls='ls -1v'
-    alias dir='dir -v'
-    alias vdir='vdir -v'
+	alias ls='ls -1v'
+	alias dir='dir -v'
+	alias vdir='vdir -v'
 fi
 
 ######################################################################
-- 
cgit v1.2.3-54-g00ecf


From ccefe3e3923a28887b96ba564cd6a4d3963f4b95 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Mon, 8 Apr 2013 10:06:21 -0400
Subject: remove ssh bash alias

---
 .config/bash/aliases.sh | 1 -
 1 file changed, 1 deletion(-)

(limited to '.config/bash/aliases.sh')

diff --git a/.config/bash/aliases.sh b/.config/bash/aliases.sh
index 3f39107..aabd073 100644
--- a/.config/bash/aliases.sh
+++ b/.config/bash/aliases.sh
@@ -36,7 +36,6 @@ alias l='ls -CF'
 # Some preferences for miscellaneous stuff                           #
 ######################################################################
 #alias rm='gvfs-trash'
-alias ssh='ssh -XC'
 #alias sed='sed --follow-symlinks' # breaks sed 4.2.2
 alias tree='tree --charset utf8'
 alias cd=pushd
-- 
cgit v1.2.3-54-g00ecf