Commit 4d474c3a107a32dd92b20240786bc65f346af64d
1 parent
b8c80db7
oleobj: added main and entry point in setup.py
Showing
2 changed files
with
7 additions
and
3 deletions
oletools/oleobj.py
| @@ -46,6 +46,7 @@ http://www.decalage.info/python/oletools | @@ -46,6 +46,7 @@ http://www.decalage.info/python/oletools | ||
| 46 | # 2016-07-18 v0.48 SL: - added Python 3.5 support | 46 | # 2016-07-18 v0.48 SL: - added Python 3.5 support |
| 47 | # 2016-07-19 PL: - fixed Python 2.6-7 support | 47 | # 2016-07-19 PL: - fixed Python 2.6-7 support |
| 48 | # 2016-11-17 v0.51 PL: - fixed OLE native object extraction | 48 | # 2016-11-17 v0.51 PL: - fixed OLE native object extraction |
| 49 | +# 2016-11-18 PL: - added main for setup.py entry point | ||
| 49 | 50 | ||
| 50 | __version__ = '0.51' | 51 | __version__ = '0.51' |
| 51 | 52 | ||
| @@ -380,7 +381,7 @@ def process_file(container, filename, data, output_dir=None): | @@ -380,7 +381,7 @@ def process_file(container, filename, data, output_dir=None): | ||
| 380 | 381 | ||
| 381 | #=== MAIN ================================================================= | 382 | #=== MAIN ================================================================= |
| 382 | 383 | ||
| 383 | -if __name__ == '__main__': | 384 | +def main(): |
| 384 | # print banner with version | 385 | # print banner with version |
| 385 | print ('oleobj %s - http://decalage.info/oletools' % __version__) | 386 | print ('oleobj %s - http://decalage.info/oletools' % __version__) |
| 386 | print ('THIS IS WORK IN PROGRESS - Check updates regularly!') | 387 | print ('THIS IS WORK IN PROGRESS - Check updates regularly!') |
| @@ -436,4 +437,6 @@ if __name__ == '__main__': | @@ -436,4 +437,6 @@ if __name__ == '__main__': | ||
| 436 | continue | 437 | continue |
| 437 | process_file(container, filename, data, options.output_dir) | 438 | process_file(container, filename, data, options.output_dir) |
| 438 | 439 | ||
| 440 | +if __name__ == '__main__': | ||
| 441 | + main() | ||
| 439 | 442 |
setup.py
| @@ -40,7 +40,7 @@ import os, fnmatch | @@ -40,7 +40,7 @@ import os, fnmatch | ||
| 40 | #--- METADATA ----------------------------------------------------------------- | 40 | #--- METADATA ----------------------------------------------------------------- |
| 41 | 41 | ||
| 42 | name = "oletools" | 42 | name = "oletools" |
| 43 | -version = '0.51a' | 43 | +version = '0.51a1' |
| 44 | 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" | 44 | 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" |
| 45 | long_desc = open('oletools/README.rst').read() | 45 | long_desc = open('oletools/README.rst').read() |
| 46 | author = "Philippe Lagadec" | 46 | author = "Philippe Lagadec" |
| @@ -274,7 +274,8 @@ entry_points = { | @@ -274,7 +274,8 @@ entry_points = { | ||
| 274 | 'oletimes=oletools.oletimes:main', | 274 | 'oletimes=oletools.oletimes:main', |
| 275 | 'olevba=oletools.olevba:main', | 275 | 'olevba=oletools.olevba:main', |
| 276 | 'pyxswf=oletools.pyxswf:main', | 276 | 'pyxswf=oletools.pyxswf:main', |
| 277 | - 'rtfobj=oletools.rtfobj:main' | 277 | + 'rtfobj=oletools.rtfobj:main', |
| 278 | + 'oleobj=oletools.oleobj:main', | ||
| 278 | ], | 279 | ], |
| 279 | } | 280 | } |
| 280 | 281 |