Skip to content
Browse files

Don't need to explicitly install Bundler because it's a dependency of…

… Rails.

Signed-off-by: Chris Brauchli <cbrauchli@gmail.com>
  • Loading branch information...
1 parent e69cd7e commit 36341ffbb63174f4dfd933e2c4561b401e55691d @cbrauchli committed
Showing with 10 additions and 18 deletions.
  1. +2 −2 README.md
  2. +6 −7 mac
  3. +2 −9 ruby
View
4 README.md
@@ -10,7 +10,7 @@ First, install [GCC for OS X](https://github.com/kennethreitz/osx-gcc-installer)
Then, run this one-liner:
- bash < <(curl -s https://raw.github.com/thoughtbot/laptop/master/mac)
+ bash < <(curl -s https://raw.github.com/cbrauchli/laptop/master/mac)
Ubuntu
------
@@ -19,7 +19,7 @@ First, install [Ubuntu](http://www.ubuntu.com/download).
Then, run this one-liner:
- bash < <(curl -s https://raw.github.com/thoughtbot/laptop/master/ubuntu)
+ bash < <(curl -s https://raw.github.com/cbrauchli/laptop/master/ubuntu)
If you're setting up Ubuntu for one of our workshops, we recommend you also install gEdit for your text editor.
You can [customize it with these instructions](http://blog.sudobits.com/2011/04/02/textmate-for-ubuntu-linux/).
View
13 mac
@@ -3,22 +3,18 @@
echo "Checking for SSH key, generating one if it doesn't exist ..."
[[ -f ~/.ssh/id_rsa.pub ]] || ssh-keygen -t rsa
-echo "Copying public key to clipboard. Paste it into your Github account (https://github.com/account/ssh)..."
+echo "Copying public key to clipboard. Paste it into your Unfuddle account ..."
[[ -f ~/.ssh/id_rsa.pub ]] && cat ~/.ssh/id_rsa.pub | pbcopy
- open https://github.com/account/ssh
echo "Installing Homebrew, a good OS X package manager ..."
/usr/bin/ruby -e "$(curl -fsSL https://raw.github.com/gist/323731)"
brew update
-echo "Installing Postgres, a good open-source relational database ..."
- brew install postgres --no-python
+echo "Installing MySQL, a good open-source relational database ..."
+ brew install mysql
echo "Installing Redis, a good key-value database ..."
brew install redis
-
-echo "Installing MongoDB, a good open-source document-store database ..."
- brew install mongodb
echo "Installing ack, a good way to search through files ..."
brew install ack
@@ -29,6 +25,9 @@ echo "Installing tmux, a good way to save project state and switch between proje
echo "Installing ImageMagick, good for cropping and re-sizing images ..."
brew install imagemagick
+echo "Installing cloc, to count lines of code (why would you?) ..."
+ brew install cloc
+
echo "Installing RVM (Ruby Version Manager) ..."
curl -s https://rvm.beginrescueend.com/install/rvm -o rvm-installer ; chmod +x rvm-installer ; ./rvm-installer --version latest
echo "
View
11 ruby
@@ -2,9 +2,6 @@ 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
-echo "Installing Bundler for managing Ruby libraries ..."
- gem install bundler --no-rdoc --no-ri
-
echo "Installing Rails to write and run web applications ..."
gem install rails --no-rdoc --no-ri
@@ -14,9 +11,5 @@ echo "Installing the Heroku gem to interact with the http://heroku.com API ..."
echo "Installing the Taps gem to push and pull SQL databases between development, staging, and production environments ..."
gem install taps --no-rdoc --no-ri
-echo "Installing the pg gem to talk to Postgres databases ..."
- gem install pg --no-rdoc --no-ri
-
-echo "Installing the mongoid gem to talk to MongoDB databases ..."
- gem install mongoid --no-rdoc --no-ri
-
+echo "Installing the mysql gem to talk to MySQL databases ..."
+ gem install mysql --no-rdoc --no-ri

0 comments on commit 36341ff

Please sign in to comment.
Something went wrong with that request. Please try again.