@@ -726,61 +726,32 @@ def run():
726726 # global variables brought down
727727
728728 if (len (argv ) == 1 and os .sys .stdin .isatty ()):
729- usage () # runs if given no arguements
729+ parser . print_help () # runs if given no arguements
730730 return
731- for i in range (1 , len (argv [1 :]) + 1 ):
732- if (argv [i ] == "-h" or argv [i ] == "--help" ):
733- usage ()
734- return
735- elif (argv [i ] == "-c" or argv [i ] == "--case" ):
736- CASE = True
737- elif (argv [i ] == "-e" or argv [i ] == "--exact" ):
738- EXACT = True
739- elif (argv [i ] == "-i" or argv [i ] == "--ignore" ):
740- IGNORE = True
741- elif (argv [i ] == "-j" or argv [i ] == "--json" ):
742- JSON = True
743- elif (argv [i ] == "-m" or argv [i ] == "--mirror" ):
744- mirror (argv [i + 1 ])
745- return
746- elif (argv [i ] == "-o" or argv [i ] == "--overflow" ):
747- OVERFLOW = True
748- elif (argv [i ] == "-p" or argv [i ] == "--path" ):
749- path (argv [i + 1 ])
750- return
751- elif (argv [i ] == "-t" or argv [i ] == "--title" ):
752- TITLE = True
753- elif (argv [i ] == "-u" or argv [i ] == "--update" ):
754- update ()
755- return
756- elif (argv [i ] == "-w" or argv [i ] == "--www" ):
757- WEBLINK = True
758- elif (argv [i ] == "-x" or argv [i ] == "--examine" ):
759- examine (argv [i + 1 ])
760- return
761- elif (argv [i ] == "--colour" ):
762- COLOUR = False
763- elif (argv [i ] == "--id" ):
764- EDBID = True
765- elif (argv [i ] == "--nmap" ):
766- try :
767- if (argv [i + 1 ][0 ] != "-" ):
768- print (nmapxml (argv [i + 1 ]))
769- if not nmapxml (argv [i + 1 ]):
770- if not nmapgrep (argv [i + 1 ]):
771- usage ()
772- else :
773- usage ()
774- except :
775- if (not os .sys .stdin .isatty ()):
776- if not nmapxml ():
777- if not nmapgrep ():
778- usage ()
779- else :
780- usage ()
781- return
782- else :
783- terms .append (argv [i ])
731+
732+ if parseArgs .mirror != None :
733+ mirror (parseArgs .mirror )
734+ return
735+ elif parseArgs .path != None :
736+ path (parseArgs .path )
737+ return
738+ elif parseArgs .update :
739+ update ()
740+ return
741+ elif parseArgs .examine != None :
742+ examine (parseArgs .examine )
743+ return
744+ elif parseArgs .nmap != None :
745+ result = nmapxml (parseArgs .nmap )
746+ if not result :
747+ result = nmapgrep (parseArgs .nmap )
748+ if not result :
749+ parser .print_help ()
750+ return
751+ print (result )
752+ return
753+
754+ terms .extend (parseArgs .searchTerms )
784755
785756 if (not os .sys .stdin .isatty ()):
786757 text = str (os .sys .stdin .read ())
0 commit comments