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.

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

Fix dist_get script: prevents get_go_vars() returns same %s-%s values twice #3078

Closed
wants to merge 6 commits into from

Conversation

MrSparc
Copy link

@MrSparc MrSparc commented Aug 12, 2016

This PR fix bin/dist_get_script script used to download dependencies.
License: MIT
Signed-off-by: MrSparc sparciie@yahoo.com

make install fails when tries to use dist_get script to download gx becauseget_go_vars() method returns the same var values GOOS and GOARCH twice, ie:

gx_v0.8.0_linux-amd64linux-amd64.tar.gz
instead of:
gx_v0.8.0_linux-amd64.tar.gz

This is my first PR on this project, so be friendly please and excuse me if breaking any procedure or mistake :)
Greetings from Portugal!

@whyrusleeping
Copy link
Member

This Looks good to me, thank you!

If you could sign off on your commit by doing git commit --amend and putting:

License: MIT
Signed-off-by: MrSparc sparciie@yahoo.com

At the bottom, that will let us get this merged in.

@MrSparc
Copy link
Author

MrSparc commented Aug 12, 2016

Sorry for all this mess with git :(, I promise be more careful and read community docs about it the next time.

@whyrusleeping
Copy link
Member

No worries! It happens all the time :)

On Fri, Aug 12, 2016, 09:56 Ariel Machado notifications@github.com wrote:

Sorry for all this mess with git :(, I promise be more careful and read
community docs about it the next time.


You are receiving this because you commented.
Reply to this email directly, view it on GitHub
#3078 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/ABL4HMokiENVSJ_qv5QD76cYdn_jMvFCks5qfKWmgaJpZM4JjO2K
.

@MrSparc
Copy link
Author

MrSparc commented Aug 12, 2016

I don't know why or how to solve but looks GitCop doesn't like my signature when push a merge required after amend comments :/
If needed, you can close this PR and merge this fix by manual, I give you all my credits and rights! :)

@MrSparc MrSparc closed this Aug 12, 2016
@MrSparc MrSparc reopened this Aug 12, 2016
@chriscool
Copy link
Contributor

@MrSparc when I look at your branch using git log --oneline --decorate --graph I see:

*   6c27f5f (mrsparc/master) Merge branch 'master' of https://github.com/MrSparc/go-ipfs
|\  
| *   ccbaffc Merge branch 'master' of https://github.com/MrSparc/go-ipfs
| |\  
| | *   e40eb5a Merge branch 'master' of https://github.com/MrSparc/go-ipfs
| | |\  
| * | \   4fc0591 Merge branch 'master' of https://github.com/MrSparc/go-ipfs
| |\ \ \  
| | |/ /  
| |/| /   
| | |/    
| | * 0e5c2ef Fix dist_get script: prevents get_go_vars() returns same %s-%s values twice
| * | c5e0927 Fix dist_get script: prevents get_go_vars() returns same %s-%s values twice
| |/  
* | 80d036e Fixes dist_get script: prevents get_go_vars() returns same %s-%s values twice
|/  
* 685cd28 (HEAD -> master, tag: v0.4.3-rc3, origin/master, origin/HEAD) ipfs version 0.4.3-rc3

I think you might want to clean that up and that may fix the GitCop problems too.

@Kubuxu
Copy link
Member

Kubuxu commented Aug 13, 2016

@chriscool I just reapplied the patch over here for him: #3079

This can probably be closed.

@chriscool
Copy link
Contributor

(Also 0e5c2ef, which is part of your branch, still has no "License" and "Signed-off-by" trailers.)

@Kubuxu thanks! I am just explaining why GitCop is not happy.

zramsay and others added 4 commits August 13, 2016 23:55
- Docker for Mac/Windows is out of beta
- docker-machine is recommended for unsupported machines

License: MIT
Signed-off-by: Zach Ramsay <zach@erisindustries.com>
License: MIT
Signed-off-by: Jeromy <why@ipfs.io>
License: MIT
Signed-off-by: Jeromy <why@ipfs.io>
License: MIT
Signed-off-by: Jeromy <why@ipfs.io>
License: MIT
Signed-off-by: MrSparc <sparciie@yahoo.com>
@MrSparc
Copy link
Author

MrSparc commented Aug 13, 2016

Thanks @chriscool for your explanation and sorry again for all this mess wit git...
I tried to fix the sign-off comment and the multiple merges but the rebase on my repository went wrong...
The original patch will be handled at #3079 thankfully by @Kubuxu so this PR can be closed.

@Kubuxu Kubuxu closed this Aug 14, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants