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

base: fix xx-info failing on macOS #72

Merged
merged 1 commit into from
Jul 7, 2022

Conversation

thaJeztah
Copy link
Contributor

@thaJeztah thaJeztah commented Jul 7, 2022

macOS doesn't have a /etc/os-release, which caused the script to fail
when running on the host.

Also adds detection if /etc/os-release exists,.

macOS doesn't have a /etc/os-release, which caused the script to fail
when running on the host. Also adds detection if /etc/os-release exists.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah changed the title base: fix xx-info failing on macOS, set default vendor to "unknown" base: fix xx-info failing on macOS Jul 7, 2022
@thaJeztah
Copy link
Contributor Author

removed the bit about "unknown", as it was already initialised to "unknown" by default

@@ -328,7 +328,7 @@ case "$1" in
echo $XX_TRIPLE
;;
"vendor")
echo $XX_VENDOR
echo "$XX_VENDOR"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

validate was complaining about this one not being quoted (not sure why it only complains about this one, and not the other ones 🤷‍♂️

Copy link
Collaborator

Choose a reason for hiding this comment

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

yes this one is strange, looks good now.

Copy link
Collaborator

@crazy-max crazy-max left a comment

Choose a reason for hiding this comment

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

LGTM

@crazy-max crazy-max merged commit 9ef71c7 into tonistiigi:master Jul 7, 2022
@thaJeztah thaJeztah deleted the fix_vendor_macos branch July 7, 2022 12:49
trilom pushed a commit to trailmix/xx that referenced this pull request Sep 9, 2022
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.

2 participants