josh/files
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use 'local' for variables which should be

Browse Source
This commit is contained in:
Josh Holtrop 2011-01-11 10:42:34 -05:00
parent 06caed7a4e
commit adcc00d9a3
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
bash_aliases
View File

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