Merge pull request #389 from Veil-Framework/upda

Updated update.py

CHANGELOG

@@ -1,3 +1,8 @@
+[09.12.2016]
+ Released.: 2.28.2
+ Modified.: Setup script heavily updated by @g0tmi1k, thanks for the continued updates!
+ Modified.: update.py script now changes the pyinstaller update path based on the latest setup script updates
+
 [07.19.2016]
  Released.: 2.28.1
  Modified.: Modified user submission, checks to ensure "=" is present for extra msfvenom options, and doesn't error out. Converted tabs to spaces

config/update.py

@@ -170,8 +170,10 @@ def generateConfig(options):
  else:
  msfpath = raw_input(" [>] Please enter the path of your metasploit installation: ")
  options["MSFVENOM_PATH"] = msfpath
- if os.path.isdir('/usr/share/pyinstaller'):
- options["PYINSTALLER_PATH"] = "/usr/share/pyinstaller/"
+ if os.path.isdir('/opt/veil/PyInstaller-3.2/'):
+ options["PYINSTALLER_PATH"] = "/opt/veil/PyInstaller-3.2/"
+ elif os.path.isdir('/usr/share/pyinstaller'):
+ options["PYINSTALLER_PATH"] = '/usr/share/pyinstaller/'
  else:
  options["PYINSTALLER_PATH"] = "/opt/pyinstaller-2.0/"
  elif issue.startswith("BackTrack"):
@@ -182,7 +184,7 @@ def generateConfig(options):
  options["MSFVENOM_PATH"] = "/usr/bin/"
  else:
  options["MSFVENOM_PATH"] = "/opt/metasploit/msf3/"
- options["PYINSTALLER_PATH"] = "/usr/share/pyinstaller"
+ options["PYINSTALLER_PATH"] = "/opt/veil/PyInstaller-3.2/"
  else:
  options["OPERATING_SYSTEM"] = "Linux"
  options["TERMINAL_CLEAR"] = "clear"
@@ -192,7 +194,7 @@ def generateConfig(options):
  options["MSFVENOM_PATH"] = "/usr/bin/"
  else:
  options["MSFVENOM_PATH"] = msfpath
- options["PYINSTALLER_PATH"] = "/usr/share/pyinstaller"
+ options["PYINSTALLER_PATH"] = "/opt/veil/PyInstaller-3.2/"
 
  # last of the general options
  options["TEMP_DIR"] = "/tmp/"
@@ -227,4 +229,4 @@ def generateConfig(options):
  print " [!] ERROR: PLATFORM NOT CURRENTLY SUPPORTED"
  sys.exit()
 
- generateConfig(options)
+ generateConfig(options)

modules/common/messages.py

@@ -8,7 +8,7 @@
 import helpers
 
 
-version = "2.28.1"
+version = "2.28.2"
 
 
 # try to find and import the settings.py config file