Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: caius/zshrc
base: a2d02eb723
...
head fork: caius/zshrc
compare: 34d1cadf04
  • 9 commits
  • 8 files changed
  • 0 commit comments
  • 1 contributor
View
3  dotfiles/rdebugrc
@@ -0,0 +1,3 @@
+set autolist
+set autoeval
+set autoreload
View
8 functions/cap
@@ -2,8 +2,12 @@
# Otherwise just passes through to `cap`
# function cap {
CAP=$(whence -p cap)
- if [[ "$1" == "deploy" || "$2" == "deploy" || "$3" == "deploy" ]]; then
- git push && $CAP $*
+ if [[ "$1" == "deploy" || "$2" == "deploy" || "$3" == "deploy" || "$1" == "deploy:migrations" || "$2" == "deploy:migrations" ]]; then
+ git push || return 1
+ fi
+ # Handle those projects without a Gemfile
+ if [[ -f "Gemfile" ]]; then
+ bundle exec cap $*
else
$CAP $*
fi
View
2  functions/ea-ssh
@@ -1,3 +1,3 @@
# function ea-ssh () {
- ssh ea-admin@$1.gb1.brightbox.com
+ ssh -p 2222 ea-admin@$1.gb1.brightbox.com
# }
View
2  functions/ea-ssh6
@@ -1,3 +1,3 @@
# function ea-ssh6 () {
- ssh ea-admin@ipv6.$1.gb1.brightbox.com
+ ssh -p2222 ea-admin@ipv6.$1.gb1.brightbox.com
# }
View
6 functions/sg
@@ -1,8 +1,8 @@
# script/generate in any rails version
# function sg () {
if [[ -e "script/generate" ]]; then
- script/generate $*
+ bundle exec script/generate $*
else
- echo "Need to implement rails 3 command"
+ bundle exec script/rails generate $*
fi
-# }
+# }
View
34 lib/alias.zsh
@@ -112,6 +112,7 @@ alias ti='git'
alias tit='git'
alias gits='git'
alias guit="git"
+alias ig="git"
alias gitst='git st'
alias gtst='git st'
@@ -129,22 +130,6 @@ alias sqlite='sqlite3'
# Override ZSH's built ins
alias time="$(whence -p time)"
-# bbcloud cli
-alias bb-accounts="brightbox-accounts"
-alias bb-acc="brightbox-accounts"
-alias bb-config="brightbox-config"
-alias bb-servers="brightbox-servers"
-alias bb-srvs="brightbox-servers"
-alias bb-users="brightbox-users"
-alias bb-cloudips="brightbox-cloudips"
-alias bb-cips="brightbox-cloudips"
-alias bb-images="brightbox-images"
-alias bb-imgs="brightbox-images"
-alias bb-types="brightbox-types"
-alias bb-typs="brightbox-types"
-alias bb-zones="brightbox-zones"
-alias bb-lbs='brightbox-lbs'
-
# ln -s /System/Library/Frameworks/JavascriptCore.framework/Versions/A/Resources/jsc ~/bin/
alias javascript="jsc"
@@ -153,3 +138,20 @@ alias csshx="csshX"
# Prettify JSON/XML
alias pretty_json="python -m json.tool"
alias pretty_xml="xmllint --format -"
+
+# brightbox-cli alias'
+alias bb-accounts="brightbox-accounts"
+alias bb-firewall-policies="brightbox-firewall-policies"
+alias bb-fwp="brightbox-firewall-policies"
+alias bb-images="brightbox-images"
+alias bb-types="brightbox-types"
+alias bb-cloudips="brightbox-cloudips"
+alias bb-cips="brightbox-cloudips"
+alias bb-firewall-rules="brightbox-firewall-rules"
+alias bb-fwr="brightbox-firewall-rules"
+alias bb-lbs="brightbox-lbs"
+alias bb-users="brightbox-users"
+alias bb-config="brightbox-config"
+alias bb-groups="brightbox-groups"
+alias bb-servers="brightbox-servers"
+alias bb-zones="brightbox-zones"
View
1  lib/correction.zsh
@@ -12,4 +12,5 @@ alias port='nocorrect port'
alias brew='nocorrect brew'
alias scp="nocorrect scp"
alias rspec="nocorrect rspec"
+alias rvm="nocorrect rvm"
alias spec="nocorrect spec"
View
20 lib/exports.zsh
@@ -1,8 +1,10 @@
# make sure Homebrew s/bin comes first
-PATH="$HOME/bin:/usr/local/Cellar/jruby/1.5.6/jruby/bin:/Users/caius/.cabal/bin:/usr/local/share/npm/bin"
-PATH="$PATH:/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/X11/bin"
-#PATH="$PATH:/opt/PalmSDK/Current/bin:/opt/PalmPDK/bin:/opt/nova/bin"
-PATH="$PATH:/usr/texbin"
+PATH="$HOME/bin" # Home folder overrides everything
+PATH="$HOME:$HOME/.cabal/bin:/usr/local/share/npm/bin" # Haskell & Node.js binfiles
+PATH="$PATH:/usr/local/bin:/usr/local/sbin" # Homebrew
+PATH="$PATH:/usr/bin:/bin:/usr/sbin:/sbin:/usr/X11/bin" # Normal $PATH bit
+PATH="$PATH:/usr/texbin" # LaTeX stuff
+PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
export PATH
# And the same for the manpath
@@ -26,12 +28,6 @@ export PYTHONPATH="/usr/local/lib/python2.6/site-packages"
# Fuck you make
export MAKEFLAGS='-j4'
-# Twitter performance tweaks for REE
-# export RUBY_HEAP_MIN_SLOTS=500000
-# export RUBY_HEAP_SLOTS_INCREMENT=250000
-# export RUBY_HEAP_SLOTS_GROWTH_FACTOR=1
-# export RUBY_GC_MALLOC_LIMIT=50000000
-
# From http://grease-your-suite.heroku.com/#87
export RUBY_HEAP_MIN_SLOTS=1000000
export RUBY_HEAP_SLOTS_INCREMENT=1000000
@@ -42,5 +38,5 @@ export RUBY_HEAP_FREE_MIN=500000
# Coz I wanna be different, yeah?
export SUDO_PROMPT="Sudo Password: "
-# jumping on that there node bandwagon
-export NODE_PATH="/usr/local/lib/node"
+# Default to emberads for brightbox-cli
+export CLIENT="ea"

No commit comments for this range

Something went wrong with that request. Please try again.