Merged revisions 5386-5391 via svnmerge from

svn+ssh://metasploit.com/home/svn/framework3/branches/framework-3.1 ........ r5391 | hdm | 2008-02-02 15:26:48 -0600 (Sat, 02 Feb 2008) | 3 lines Prepend a library directory to the search path, if MSF_LOCAL_LIB is set. This lets folks maintain a set of modified libraries that will be used instead of the official ones. Documentation updates as well. ........ git-svn-id: file:///home/svn/framework3/trunk@5392 4d416f70-5f16-0410-b530-b9f4589650da
rapid7 · Feb 2, 2008 · 271822d · 271822d
1 parent fca877c
commit 271822d
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 3 deletions.
diff --git a/documentation/users_guide.pdf b/documentation/users_guide.pdf
diff --git a/documentation/users_guide.tex b/documentation/users_guide.tex
@@ -24,7 +24,11 @@
         \huge{Metasploit Framework User Guide}
 		\ \\[10mm]
 		\large{Version 3.1}
-		\\[120mm]
+		\\[10mm]
+
+		\includegraphics{hacker04.jpg}
+
+		\ \\[10mm]
 
         \small{\url{http://www.metasploit.com/}}
 

diff --git a/msfcli b/msfcli
@@ -7,6 +7,7 @@
 
 msfbase = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
 $:.unshift(File.join(File.dirname(msfbase), 'lib'))
+$:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'rex'
 require 'msf/ui'

diff --git a/msfconsole b/msfconsole
@@ -6,6 +6,7 @@
 
 msfbase = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
 $:.unshift(File.join(File.dirname(msfbase), 'lib'))
+$:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'rex'
 require 'msf/ui'

diff --git a/msfd b/msfd
@@ -8,6 +8,7 @@
 
 msfbase = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
 $:.unshift(File.join(File.dirname(msfbase), 'lib'))
+$:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'msf/base'
 require 'msf/ui'

diff --git a/msfencode b/msfencode
@@ -2,6 +2,7 @@
 
 msfbase = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
 $:.unshift(File.join(File.dirname(msfbase), 'lib'))
+$:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'rex'
 require 'msf/ui'

diff --git a/msfgui b/msfgui
@@ -5,7 +5,7 @@
 
 msfbase = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
 $:.unshift(File.join(File.dirname(msfbase), 'lib'))
-
+$:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'rex'
 require 'msf/base'

diff --git a/msfopcode b/msfopcode
@@ -7,6 +7,7 @@
 
 msfbase = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
 $:.unshift(File.join(File.dirname(msfbase), 'lib'))
+$:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'rex'
 require 'rex/ui'

diff --git a/msfpayload b/msfpayload
@@ -2,6 +2,7 @@
 
 msfbase = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
 $:.unshift(File.join(File.dirname(msfbase), 'lib'))
+$:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'rex'
 require 'msf/ui'

diff --git a/msfpescan b/msfpescan
@@ -2,6 +2,7 @@
 
 msfbase = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
 $:.unshift(File.join(File.dirname(msfbase), 'lib'))
+$:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'rex/peparsey'
 require 'rex/pescan'

diff --git a/msfweb b/msfweb
@@ -5,7 +5,7 @@
 
 msfbase = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
 $:.unshift(File.join(File.dirname(msfbase), 'lib'))
-
+$:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 
 require 'msf/base'