Skip to content

Commit

Permalink
depend on zsh publicly, and sh where possible
Browse files Browse the repository at this point in the history
  • Loading branch information
mike-burns committed Jul 10, 2012
1 parent 2d6cef6 commit 6045750
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if you're on Lion (OS X 10.7).

Run the script:

bash < <(curl -s https://raw.github.com/thoughtbot/laptop/master/mac)
zsh < <(curl -s https://raw.github.com/thoughtbot/laptop/master/mac)

What it sets up
---------------
Expand Down
2 changes: 2 additions & 0 deletions heroku
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/bin/sh

echo "Installing the heroku-accounts plugin for using multiple Heroku accounts..."
heroku plugins:install git://github.com/ddollar/heroku-accounts.git

Expand Down
6 changes: 3 additions & 3 deletions mac
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/usr/bin/env zsh

echo "Checking for SSH key, generating one if it doesn't exist ..."
[[ -f ~/.ssh/id_rsa.pub ]] || ssh-keygen -t rsa
Expand Down Expand Up @@ -42,5 +42,5 @@ echo "Installing RVM (Ruby Version Manager) ..."
[[ -s '/Users/`whoami`/.rvm/scripts/rvm' ]] && source '/Users/`whoami`/.rvm/scripts/rvm'" >> ~/.zshrc
source ~/.zshrc

bash < <(curl -s https://raw.github.com/thoughtbot/laptop/master/ruby)
bash < <(curl -s https://raw.github.com/thoughtbot/laptop/master/heroku)
zsh < <(curl -s https://raw.github.com/thoughtbot/laptop/master/ruby)
zsh < <(curl -s https://raw.github.com/thoughtbot/laptop/master/heroku)
2 changes: 2 additions & 0 deletions ruby
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/bin/sh

echo "Installing Ruby 1.9.2 stable and making it the default Ruby ..."
rvm install 1.9.2-p290
rvm use 1.9.2 --default
Expand Down

0 comments on commit 6045750

Please sign in to comment.