Update the SetupWizard to take into account FreeBSD systems. #273
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GuillaumedeVolpiano
changed the title
Contributor
Author
|
I have now updated both BinaryFinder getArch() and SetupWizard hasBundledBinaries() to reflect the above changes. |
n-connect
approved these changes
Jun 6, 2023
Contributor
n-connect
left a comment
n-connect
left a comment
There was a problem hiding this comment.
Thanks, coming back the the original question could you test your code in the PR? I'm just reading them as of now..
lib/BinaryFinder.php
Outdated
| if (strpos($arch, 'aarch64') === 0) { | ||
| return 'aarch64'; | ||
| } | ||
| if (strpos($arch, 'amd64') == 0 && strpos($os, 'FreBSD') == 0) { |
Contributor
There was a problem hiding this comment.
Please fix it to 'FreeBSD'
Contributor
Author
There was a problem hiding this comment.
I have indeed tested it. And just retested it ;) It works, at least on my machine.
icewind1991
reviewed
Jun 8, 2023
lib/BinaryFinder.php
Outdated
Comment on lines
36
to
38
| if (strpos($arch, 'amd64') == 0 && strpos($os, 'FreeBSD') == 0) { | ||
| return 'fbsd_amd64'; | ||
| } |
Member
There was a problem hiding this comment.
Should be more generic to replace this with
if (str_starts_with($os, 'FreeBSD')) {
$arch = 'fbsd_' . $arch;
}and replace the returns above with $arch = ....
that way the freebsd logic also works with other architectures
Contributor
Author
There was a problem hiding this comment.
Done (and tested, at least on FreeBSD/amd64).
…built freebsd binary Signed-off-by: GuillaumedeVolpiano <xavier.dectot@gmail.com>
…tems and hasBundledBinaries() to check into the folder corresponding to the reported architecture rather than just in x86_64. Wizard still fails afterwards on non-systemd systems. Signed-off-by: GuillaumedeVolpiano <xavier.dectot@gmail.com>
Signed-off-by: GuillaumedeVolpiano <xavier.dectot@gmail.com>
…eeBSD as per icewind911's suggestion. Signed-off-by: GuillaumedeVolpiano <xavier.dectot@gmail.com>
GuillaumedeVolpiano
force-pushed
the
main
branch
from
4036214 to
7e7588e
Compare
icewind1991
approved these changes
Jun 23, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This only solves the first issue of using the setup wizard on freebsd, by clarifying the message about the presence of pre-built binaries.
To make the wizard run fully in FreeBSD, PR#256 needs to be merged, and then hasSystemd() will need to be amended to cover the FreeBSD rc system.