Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

trying to get this down to a one-liner

  • Loading branch information...
commit ce0b76b732a573f12912707c7e69512c0583da17 1 parent d94088f
Dan Croak croaky authored
Showing with 7 additions and 21 deletions.
  1. +2 −17 README.md
  2. +2 −2 mac
  3. +3 −2 ubuntu
19 README.md
View
@@ -8,36 +8,21 @@ Mac OS X
First, install [XCode](http://itunes.apple.com/us/app/xcode/id422352214?mt=12&ls=1). ($4.99, requires OS X 10.6.6 or higher)
-Set up your SSH key if you haven't yet:
-
- ssh-keygen -t rsa
-
Then, run this one-liner:
bash < <(curl -s https://raw.github.com/thoughtbot/laptop/master/mac)
-Install the latest version of Ruby and some useful gems:
-
- bash < <(curl -s https://raw.github.com/thoughtbot/laptop/master/ruby)
-
Ubuntu
------
First, install [Ubuntu](http://www.ubuntu.com/download).
-Set up your SSH key if you haven't yet:
-
- ssh-keygen -t rsa
-
Then, run this one-liner:
bash < <(curl -s https://github.com/thoughtbot/laptop/raw/master/ubuntu)
-Install the latest version of Ruby and some useful gems:
-
- bash < <(curl -s https://github.com/thoughtbot/laptop/raw/master/ruby)
-
-Use gEdit for your text editor. You can [customize it with these instructions](http://blog.sudobits.com/2011/04/02/textmate-for-ubuntu-linux/).
+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/).
What it sets up
---------------
4 mac
View
@@ -1,10 +1,9 @@
#!/usr/bin/env bash
echo "Checking for SSH key, generating one if it exists ..."
- [[ -f ~/.ssh/id_rsa.pub || -f ~/.ssh/id_dsa.pub ]] || ssh-keygen -t rsa
+ [[ -f ~/.ssh/id_rsa.pub ]] || ssh-keygen -t rsa
echo "Copying public key to clipboard. Paste it into your Github account ..."
- [[ -f ~/.ssh/id_dsa.pub ]] && cat ~/.ssh/id_dsa.pub | pbcopy
[[ -f ~/.ssh/id_rsa.pub ]] && cat ~/.ssh/id_rsa.pub | pbcopy
open https://github.com/account/ssh
@@ -29,3 +28,4 @@ echo "Installing RVM (Ruby Version Manager) ..."
echo "\n# RVM\n[[ -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)
5 ubuntu
View
@@ -1,10 +1,9 @@
#!/usr/bin/env bash
echo "Checking for SSH key, generating one if it exists ..."
- [[ -f ~/.ssh/id_rsa.pub || -f ~/.ssh/id_dsa.pub ]] || ssh-keygen -t rsa
+ [[ -f ~/.ssh/id_rsa.pub ]] || ssh-keygen -t rsa
echo "Copying public key to clipboard. Paste it into your Github account ..."
- [[ -f ~/.ssh/id_dsa.pub ]] && cat ~/.ssh/id_dsa.pub | xclip
[[ -f ~/.ssh/id_rsa.pub ]] && cat ~/.ssh/id_rsa.pub | xclip
open https://github.com/account/ssh
@@ -28,3 +27,5 @@ echo "Installing ImageMagick, good for cropping and re-sizing images ..."
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
+
+bash < <(curl -s https://raw.github.com/thoughtbot/laptop/master/ruby)
Please sign in to comment.
Something went wrong with that request. Please try again.