Skip to content

Instantly share code, notes, and snippets.

View lauriro's full-sized avatar

Lauri Rooden lauriro

View GitHub Profile
@lauriro
lauriro / diffmerge-diff.sh
Created March 4, 2010 13:41
diffmerge-diff.sh
#!/bin/sh
if [ ! -f "$2" -o ! -f "$5" ] ; then
echo "One side missing: $2 vs. $5"
exit 0
fi
if which cygpath &> /dev/null; then
path="$(cygpath $1)"
@lauriro
lauriro / .bachrc
Created February 15, 2010 07:53
.bachrc
SSH_AGENT_FILE=`echo ~/.ssh-agent-$(hostname)`
source ${SSH_AGENT_FILE} &> /dev/null
alias ssh-add='if ! kill -0 "$SSH_AGENT_PID" 2>/dev/null; then ssh-agent > "$SSH_AGENT_FILE"; source "$SSH_AGENT_FILE"; fi; ssh-add'
alias ui='cd /cygdrive/d/Code/yoga/web'
alias web='cd /cygdrive/d/Code/github/lauriro.github.com'
alias runphp='/usr/local/php-5.3.1/php-cgi.exe -b 127.0.0.1:9000 &'
alias runwww='kill `cat /var/run/lighttpd.pid` 2>/dev/null; /usr/sbin/lighttpd -f /etc/lighttpd/lighttpd.conf'