From adcc00d9a39704c7e3716de012b25964e197c421 Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop+git@gmail.com>
Date: Tue, 11 Jan 2011 10:42:34 -0500
Subject: [PATCH] use 'local' for variables which should be

---
 bash_aliases | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/bash_aliases b/bash_aliases
index 46495e5..9688983 100644
--- a/bash_aliases
+++ b/bash_aliases
@@ -23,17 +23,17 @@ function svn-branch()
 {
     # do from anywhere in a working copy of the repository
     # usage: svn-branch branch-name -m "comment"
-    branch_name="$1"
+    local branch_name="$1"
     shift 1
     svn copy `svn-root`/trunk `svn-root`/branches/"$branch_name" "$@"
 }
 function svn-merge-branch()
 {
     # usage: svn-merge-branch branch-name branch-dir -m "comment"
-    branch_name="$1"
-    branch_dir="$2"
+    local branch_name="$1"
+    local branch_dir="$2"
     shift 2
-    branch_rev=$(svn log --stop-on-copy `svn-root`/branches/"$branch_name" | egrep -A1 -- '-{50}' | egrep '^r[0-9]+' | tail -n 1 | sed -re 's/^r([0-9]+).*/\1/')
+    local branch_rev=$(svn log --stop-on-copy `svn-root`/branches/"$branch_name" | egrep -A1 -- '-{50}' | egrep '^r[0-9]+' | tail -n 1 | sed -re 's/^r([0-9]+).*/\1/')
     svn merge -r${branch_rev}:HEAD `svn-root`/branches/"$branch_name""$branch_dir" "$@"
 }
 alias cribbage='cribbage -r'
@@ -44,22 +44,22 @@ alias ls='ls --color=auto'
 export LESS='Ri'
 function mark()
 {
-    MARKS_FILE=${HOME}/.marks
-    param="$1"
+    local MARKS_FILE=${HOME}/.marks
+    local param="$1"
     if [[ ! -f ${MARKS_FILE} ]]; then
         touch ${MARKS_FILE}
     fi
     case "$param" in
     -g)
-        mark_name="$2"
-        mark_dir=$(grep "^$mark_name:" ${MARKS_FILE} | sed -e 's/[^:]*://')
+        local mark_name="$2"
+        local mark_dir=$(grep "^$mark_name:" ${MARKS_FILE} | sed -e 's/[^:]*://')
         if [[ "$mark_dir" != "" ]]; then
             cd "$mark_dir"
         fi
         ;;
     -s)
-        mark_name="$2"
-        mark_dir=$(grep "^$mark_name:" ${MARKS_FILE} | sed -e 's/[^:]*://')
+        local mark_name="$2"
+        local mark_dir=$(grep "^$mark_name:" ${MARKS_FILE} | sed -e 's/[^:]*://')
         echo "$mark_dir"
         ;;
     -h)
@@ -73,7 +73,7 @@ function mark()
         cat ${MARKS_FILE}
         ;;
     -d)
-        mark_name="$2"
+        local mark_name="$2"
         grep -v "^$mark_name:" ${MARKS_FILE} > ${MARKS_FILE}.tmp
         mv ${MARKS_FILE}.tmp ${MARKS_FILE}
         ;;
@@ -81,8 +81,8 @@ function mark()
         echo "Unrecognized option"
         ;;
     *)
-        mark_name="$1"
-        mark_dir="$2"
+        local mark_name="$1"
+        local mark_dir="$2"
         if [[ "$mark_dir" == "" ]]; then
             mark_dir=`pwd`
         fi
@@ -97,7 +97,7 @@ export EDITOR=vim
 function git-config-joshs()
 {
     git config --global user.name 'Josh Holtrop'
-    domain='gmail.com'
+    local domain='gmail.com'
     git config --global user.email 'jholtrop+git@'${domain}
     git config --global push.default matching
     git config --global color.ui true
@@ -106,10 +106,10 @@ function git-config-joshs()
 }
 function svn()
 {
-    subcommand="$1"
-    realsvn=$(which svn 2>/dev/null)
-    colorsvn=$(which colorsvn 2>/dev/null)
-    colordiff=$(which colordiff 2>/dev/null)
+    local subcommand="$1"
+    local realsvn=$(which svn 2>/dev/null)
+    local colorsvn=$(which colorsvn 2>/dev/null)
+    local colordiff=$(which colordiff 2>/dev/null)
     if [[ "$realsvn" == "" ]]; then
         echo "Subversion not found in \$PATH"
         return