From 41b5b8fd0622753516b1d925bceda2efb2ddbb59 Mon Sep 17 00:00:00 2001
From: Brendan Coles <bcoles@gmail.com>
Date: Fri, 29 Jan 2016 16:50:01 +0000
Subject: [PATCH] Use Ruby 2.1.5

---
 INSTALL.txt  | 33 +++++++++++++++++----------------
 install-beef | 16 ++++++++--------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/INSTALL.txt b/INSTALL.txt
index 78bb3a41b..429cef96f 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -20,7 +20,7 @@ Installation
 
    1. Prerequisites (platform independent)
 
-      BeEF requires ruby 1.9 and the "bundler" gem. Bundler can be installed by:
+      BeEF requires Ruby 2.0+ and the "bundler" gem. Bundler can be installed by:
 
       gem install bundler
 
@@ -31,41 +31,41 @@ Installation
       
       Windows requires the sqlite.dll.  Simply grab the zip file below and extract it to your Ruby bin directory:
 
-	  http://www.sqlite.org/sqlitedll-3_7_0_1.zip
+      http://www.sqlite.org/sqlitedll-3_7_0_1.zip
 
-	  Other than that, you also need TheRubyRacer. As it's painful to install it on Windows, you can download 2 pre-compiled V8 DLLs and 2 gems from https://github.com/eakmotion/therubyracer_for_windows.
+      Other than that, you also need TheRubyRacer. As it's painful to install it on Windows, you can download 2 pre-compiled V8 DLLs and 2 gems from https://github.com/eakmotion/therubyracer_for_windows.
+
+      Finally, edit beef's gem lock file by replacing the required ruby racer version with the version downloaded from the link above. 
 
-	Finally, edit beef's gem lock file by replacing the required ruby racer version with the version downloaded from the link above. 
-	
    3. Prerequisites (Linux)
 
       !!! This must be done PRIOR to running the bundle install command !!!
-      
+
       On linux you will need to find the packages specific to your distribution for sqlite.  An example for Ubuntu systems is:
 
       3.0. sudo apt-get install libsqlite3-dev sqlite3 sqlite3-doc
       3.1. install rvm from rvm.beginrescueend.com, this takes care of the various incompatible and conflicting ruby packages that are required
-      3.2. rvm install 1.9.3-p484
-      3.3. rvm use 1.9.3
-	  
+      3.2. rvm install 2.1.5
+      3.3. rvm use 2.1.5
+  
    4. Prerequisites (Mac OSX)
    
       - XCode: provides the sqlite support BeEF needs
       
-      - Ruby 1.9
-      	To install RVM and Ruby 1.9.3 on Mac OS:
+      - Ruby 2.0
+      	To install RVM and Ruby 2.1.5 on Mac OS:
       	$ bash -s stable < <(curl -Ls https://raw.githubusercontent.com/wayneeseguin/rvm/master/binscripts/rvm-installer) source ~/.bash_profile
-      	$ rvm install 1.9.3-p484
-		$ rvm use 1.9.3
-      
+      	$ rvm install 2.1.5
+        $ rvm use 2.1.5
+
 
    5. Install instructions
    
       Obtain application code either by downloading an archive from https://github.com/beefproject/beef/archive/master.zip or cloning the GIT repo https://github.com/beefproject/beef.git
 
-	  Enter into the newly created BeEF directory, and type:
+      Enter into the newly created BeEF directory, and type:
 
-	  bundle install
+      bundle install
 
       Bundler installs all the pre-requisite gems.
 
@@ -74,3 +74,4 @@ Installation
       Simply run:
 
       ./beef -x
+
diff --git a/install-beef b/install-beef
index eb440889c..594ce7936 100644
--- a/install-beef
+++ b/install-beef
@@ -40,11 +40,11 @@ fi
 
 if [ "$OS" == "Darwin" ]; then
 	echo "Mac OSX Detected"
-	echo "Installing Ruby Version Manager (RVM) & Ruby 1.9.3.."
+	echo "Installing Ruby Version Manager (RVM) & Ruby 2.1.5.."
 	bash -s stable < <(curl -Ls https://raw.githubusercontent.com/wayneeseguin/rvm/master/binscripts/rvm-installer)
 	source ~/.bash_login
-	rvm install 1.9.3-p0 --with-gcc=clang
-	rvm use 1.9.3-p0
+	rvm install 2.1.5 --with-gcc=clang
+	rvm use 2.1.5
 	echo ""
 	echo "Downloading BeEF.."
 	
@@ -90,8 +90,8 @@ else
 	source /usr/local/rvm/scripts/rvm
 fi
 
-	rvm install 1.9.2
-	rvm use 1.9.2 --default
+	rvm install 2.1.5
+	rvm use 2.1.5 --default
 
 	echo "Downloading BeEF.."
 	git clone git://github.com/beefproject/beef.git
@@ -119,14 +119,14 @@ if [ "$Distro" == "RedHat" ]; then
 	sudo yum install -y git make gcc openssl-devel gcc-c++ patch readline readline-devel zlib zlib-devel libyaml-devel libffi-devel bzip2 autoconf automake libtool bison iconv-devel sqlite-devel
 
 	echo ""
-	echo "Installing Ruby Version Manager (RVM) & Ruby 1.9.2"
+	echo "Installing Ruby Version Manager (RVM) & Ruby 2.1.5"
 	wget https://raw.githubusercontent.com/wayneeseguin/rvm/master/binscripts/rvm-installer
 	bash ./rvm-installer
 	source ~/.rvm/scripts/rvm
 	rvm pkg install openssl
-	rvm install 1.9.2 --with-openssl-dir=$rvm_path/usr
+	rvm install 2.1.5 --with-openssl-dir=$rvm_path/usr
 	source ~/.rvm/scripts/rvm
-	rvm use 1.9.2 --default
+	rvm use 2.1.5 --default
 	
 	echo "Downloading BeEF.."
 	git clone git://github.com/beefproject/beef.git