8000 overhauled argument parsing by byt3bl33d3r · Pull Request #4 · ShawnDEvans/smbmap · GitHub
[go: up one dir, main page]
Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

overhauled argument parsing #4

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

overhauled argument parsing #4

wants to merge 3 commits into from

Conversation

byt3bl33d3r
Copy link

Hi,
I re-wrote the argument parsing section of the script using the python argparse library, cuts down the code by a significant amount.. I haven't tried all of the options to see if everything works as before only because its getting late over here :P, so before merging your definitely going to want to test everything out!
Also fixed the shebang to be friendlier when multiple python versions are installed.
Again, awesome script man!

Cheers

unknown and others added 3 commits April 28, 2015 16:49
Fixed bug in socket.getnameinfo() call which had incorrect parameters…
2bc5309 
… passed causing ip->name resolution to fail 100% of the time
@ShawnDEvans
Merge pull request ShawnDEvans#2 from jadacyrus/master
5eb7e6b 
Fixed bug in socket.getnameinfo() call
Fixed shebang
932ec19 
re-wrote the argument parsing, using argparse
@ShawnDEvans
Copy link
Owner

You seriously rule man!! I'll test out the features in my VM lab. This
was on my to do list, but I never used that library or realized it existed
until it was too late. Thanks a ton for the contribution!!

Shawn
On Apr 28, 2015 7:41 PM, "byt3bl33d3r" notifications@github.com wrote:

Hi,
I re-wrote the argument parsing section of the script using the python
argparse library, cuts down the code by a significant amount.. I haven't
tried all of the options to see if everything works as before only because
its getting late over here :P, so before merging your definitely going to
want to test everything out!
Also fixed the shebang to be friendlier when multiple python versions are
installed.
Again, awesome script man!

Cheers

You can view, comment on, or merge this pull request online at:

#4
Commit Summary

  • Fixed shebang

File Changes

Patch Links:

—
Reply to this email directly or view it on GitHub
#4.

@ShawnDEvans
Copy link
Owner

Hey,

Thanks again for putting in the work to get the ArgumentParser working! I tested all of the functionality, and had to make a few changes to the code you revised. I'm a bit new to using "git" on the command line. I ended up just using "--force" to force a push. For future reference, how do I correctly make changes to your code suggestions, push my changes back to your branch, and eventually to the master branch? I want to make sure you're recognized as a contributor. Thanks a ton!

-Shawn

@byt3bl33d3r
Copy link
Author

Hi shawn,
Glad you got it all sorted out!
There isn't a 'direct' way of changing the code in my fork since you don't have access to my repo.
What I usually do is this (there might be a better way):

  • In your repo, create a new branch git checkout -b branchname
  • Pull my commits into the n 6BFB ew branch git pull https://github.com/byt3bl33d3r/smbmap.git
  • Now you can modify my changes all you want
  • When you want to merge the changes, switch back to the master branch git checkout master
  • Merge the changes git merge branchname
  • Then commit and push

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@byt3bl33d3r @ShawnDEvans
0