Skip to content

Commit

Permalink
Merge branch 'master' of github.com:thepeterstone/home-sync
Browse files Browse the repository at this point in the history
  • Loading branch information
thepeterstone committed Feb 17, 2012
2 parents a337763 + 4d9645e commit bc2ef8b
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 3 deletions.
6 changes: 6 additions & 0 deletions bin/parse_url
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash

php -r "
\$parts = parse_url('$@');
parse_str(\$parts['query'], \$parts['query']);
var_export(\$parts);"
8 changes: 8 additions & 0 deletions bin/silence
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/sh

# stackoverflow.com/questions/593724
if [ "$0" -a "$1" ]; then
gdb -p $1 -x $0.gdb
else
echo Must specify PID of process to silence >&2
fi
4 changes: 4 additions & 0 deletions bin/silence.gdb
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
p dup2(open("/dev/null",0),1)
p dup2(open("/dev/null",0),2)
detach
quit
3 changes: 3 additions & 0 deletions bin/url_decode
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash

php -r "echo urldecode('$@');"
2 changes: 1 addition & 1 deletion dot-files/oh-my-zsh/plugins/svn/svn.plugin.zsh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
svn=$(which svn)
svn=/usr/bin/svn
function svn_prompt_info {
if [ $(in_svn) ]; then
echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
Expand Down
4 changes: 2 additions & 2 deletions dot-files/oh-my-zsh/themes/terst.zsh-theme
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%}✹"
ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%}➜"
ZSH_THEME_GIT_PROMPT_STAGED="%{$fg_bold[green]%}●"
ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg_bold[red]%}✕"
ZSH_THEME_GIT_PROMPT_UNSTAGED="%{$fg_bold[red]%}●"
ZSH_THEME_GIT_PROMPT_UNSTAGED="%{$fg[red]%}●"
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_bold[white]%}●"


ZSH_THEME_SVN_PROMPT_DIRTY="%{$fg_bold[red]%} ●"
ZSH_THEME_SVN_PROMPT_DIRTY="%{$fg[red]%} ●"
2 changes: 2 additions & 0 deletions dot-files/zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ plugins=(git svn)
source $ZSH/oh-my-zsh.sh

# Customize to your needs...
export EDITOR=vim
export PAGER=more
SUDO='sudo'
if [ "$USER" = "root" ]; then
SUDO=''
Expand Down

0 comments on commit bc2ef8b

Please sign in to comment.