Skip to content

feat: Manjaro support #99

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

Merged
merged 1 commit into from
Jul 29, 2020
Merged

Conversation

okinskas
Copy link
Contributor

Issue #, if available:
#77

I'd love to add support for Majaro.. PR?

Description of changes:

Packaging via Pacman was supported on Arch but not on Manjaro. I noticed the comment linked above and have added support in the packager script.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Copy link
Contributor

@marcomagdy marcomagdy left a comment

Choose a reason for hiding this comment

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

Thank you for the pull request.
I left one small comment.

@@ -56,7 +56,7 @@ if ! type zip > /dev/null 2>&1; then
exit 1
fi
function package_libc_via_pacman {
if grep "Arch Linux" < /etc/os-release > /dev/null 2>&1; then
if grep -E "Arch Linux|Manjaro Linux" < /etc/os-release > /dev/null 2>&1; then
Copy link
Contributor

Choose a reason for hiding this comment

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

Use the full option for readability please.
--extended-regexp instead of -E

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for the review @marcomagdy. Now updated to use --extended-regexp. Please re-review when you can, thanks

- added Manjaro as an OS supporting pacman
@marcomagdy marcomagdy merged commit 17473f8 into awslabs:master Jul 29, 2020
@marcomagdy
Copy link
Contributor

Thank you!

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