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

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

Closed
wants to merge 6 commits into from
Closed

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

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8311ffa
boot2docker-cli is deprecated, removed from README
zramsay Aug 6, 2016
c5d4369
commands: fix panic when stdin is empty for string args
whyrusleeping Aug 7, 2016
5efacaa
update changelog
whyrusleeping Aug 9, 2016
0911c6e
ipfs version 0.4.3-rc3
whyrusleeping Aug 10, 2016
5325e2e
bin: dist_get script: prevents get_go_vars() returns same values twice
Aug 12, 2016
29ec1af
Merge remote-tracking branch 'upstream/master'
Aug 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions bin/dist_get
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,7 @@ unarchive() {
get_go_vars() {
if [ ! -z "$GOOS" ] && [ ! -z "$GOARCH" ]; then
printf "%s-%s" "$GOOS" "$GOARCH"
fi

if have_binary go; then
elif have_binary go; then
printf "%s-%s" "$(go env GOOS)" "$(go env GOARCH)"
else
die "no way of determining system GOOS and GOARCH\nPlease manually set GOOS and GOARCH then retry."
Expand Down