Better readme, ask for either JDK 6 or JDK 7, get ruby-debug19 in the…

… default mix.
pwnall · Nov 4, 2011 · 790717a · 790717a
1 parent 2b6228a
commit 790717a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/README b/README
@@ -25,12 +25,11 @@ application.
 
 Life with +rails_pwnerer+:
 
-1) Install a bootstrap version of ruby and rubygems (yes the order is correct):
-sudo apt-get -y install ruby1.9.1
+1) Install a bootstrap version of ruby and rubygems:
+sudo apt-get -y install ruby1.9.1 make
 
 2) Install +rails_pwnerer+:
 sudo gem install rails_pwnerer make
-(if it says gem not found, retry a couple of times)
 
 3) Get your server production-ready:
 sudo rpwn scaffold

diff --git a/lib/rails_pwnerer/scaffolds/gems.rb b/lib/rails_pwnerer/scaffolds/gems.rb
@@ -30,7 +30,7 @@ def install_tools
     install_gems %w(highline termios)
 
     # Debug gems on production machines.
-    install_gems %w(echoe jeweler ruby-debug ruby-debug-ide)
+    install_gems %w(echoe jeweler ruby-debug ruby-debug19 ruby-debug-ide)
 
     # Determine number of CPUs and cores.
     install_gems %w(sys-cpu)

diff --git a/lib/rails_pwnerer/scaffolds/packages.rb b/lib/rails_pwnerer/scaffolds/packages.rb
@@ -48,7 +48,7 @@ def install_tools
             /^libcurl\d*-openssl-dev$/
 
     # needed for solr and other java-based services
-    package 'openjdk-6-jdk'
+    package /^openjdk-\d+-jdk/
 
     # useful to be able to work with compressed data
     package 'zlib-dev', /^zlib[0-9a-z]*-dev$/