Skip to content

fix: #14 to support some arch linux #15

Merged
cfc4n merged 1 commit into
gojue:masterfrom
yihong0618:master
Mar 29, 2022
Merged

fix: #14 to support some arch linux #15
cfc4n merged 1 commit into
gojue:masterfrom
yihong0618:master

Conversation

@yihong0618
Copy link
Copy Markdown
Contributor

@yihong0618 yihong0618 commented Mar 29, 2022

fix: #14 by changing the root dir.

Copy link
Copy Markdown
Member

@cfc4n cfc4n left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as codeview comment. please reupdate, and keep one git commit with git reset --soft command. thanks.

Comment thread user/config_openssl.go Outdated
if e != nil {
prefix = OTHERS_BINARY_PREFIX
}
this.Openssl = prefix + "/libssl.so.1.1"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please use filepath.Join() to concatenate strings.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

of course, I prefer to use git rebase -i HEAD~3 could I do it that way ?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, try it.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

Comment thread user/probe_gnutls.go Outdated
default:
//如果没找到
binaryPath = "/lib/x86_64-linux-gnu/libgnutls.so.30"
binaryPath = prefix + "/libgnutls.so.30"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

keep origin value due binaryPath is certain from config_* struct.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

keep origin value due binaryPath is certain from config_* struct.

Sorry I missed to understand this comment, why the logic should change here?

@yihong0618 yihong0618 requested a review from cfc4n March 29, 2022 11:44
Comment thread user/probe_gnutls.go Outdated
default:
//如果没找到
binaryPath = "/lib/x86_64-linux-gnu/libgnutls.so.30"
binaryPath = filepath.Join(prefix, "libgnutls.so.30")
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please rollback this code block. search .so path must be finished by config_ . probe_module do not choose so_ ,just use a default value.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

got it. THX

@yihong0618
Copy link
Copy Markdown
Contributor Author

Rollback and fixed

@cfc4n cfc4n merged commit 6b1d465 into gojue:master Mar 29, 2022
@cfc4n
Copy link
Copy Markdown
Member

cfc4n commented Mar 29, 2022

LGTM, thanks.

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.

Arch linux maybe in .so file maybe in different directory

2 participants