Merge remote-tracking branch 'origin/master'

decalage2
2 parents 1c52c0d5 4d474c3a
Showing 2 changed files with 7 additions and 3 deletions
oletools/oleobj.py
setup.py
@@ -46,6 +46,7 @@ http://www.decalage.info/python/oletools
 # 2016-07-18 v0.48 SL: - added Python 3.5 support
 # 2016-07-19       PL: - fixed Python 2.6-7 support
 # 2016-11-17 v0.51 PL: - fixed OLE native object extraction
+# 2016-11-18       PL: - added main for setup.py entry point
  
 __version__ = '0.51'
  
@@ -380,7 +381,7 @@ def process_file(container, filename, data, output_dir=None):
  
 #=== MAIN =================================================================
  
-if __name__ == '__main__':
+def main():
     # print banner with version
     print ('oleobj %s - http://decalage.info/oletools' % __version__)
     print ('THIS IS WORK IN PROGRESS - Check updates regularly!')
@@ -436,4 +437,6 @@ if __name__ == &#39;__main__&#39;:
             continue
         process_file(container, filename, data, options.output_dir)
  
+if __name__ == '__main__':
+    main()
  
@@ -40,7 +40,7 @@ import os, fnmatch
 #--- METADATA -----------------------------------------------------------------
  
 name         = "oletools"
-version      = '0.51a'
+version      = '0.51a1'
 desc         = "Python tools to analyze security characteristics of MS Office and OLE files (also called Structured Storage, Compound File Binary Format or Compound Document File Format), for Malware Analysis and Incident Response #DFIR"
 long_desc    = open('oletools/README.rst').read()
 author       = "Philippe Lagadec"
@@ -274,7 +274,8 @@ entry_points = {
         'oletimes=oletools.oletimes:main',
         'olevba=oletools.olevba:main',
         'pyxswf=oletools.pyxswf:main',
-        'rtfobj=oletools.rtfobj:main'
+        'rtfobj=oletools.rtfobj:main',
+        'oleobj=oletools.oleobj:main',
     ],
 }