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

Updated installer.sh for "ubuntu debian" /etc/os-release and new version string #552

Merged
merged 5 commits into from
Apr 3, 2023

Conversation

HoxhaEndri
Copy link
Member

  • What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)
    The installer can now be executed in ubuntu based distros that have "ubuntu debian" or debian as ID_LIKE in /etc/os-release.
    New version string added

  • What is the current behavior? (You can also link to an open issue here)

  • What is the new behavior (if this is a feature change)? If possible add a screenshot.

  • Does this PR introduce a breaking change? (What changes might users need to make in their application due to this PR?)

  • Other information:

@@ -417,6 +417,7 @@ fsck.fat;;gplv3;"^fsck\.fat\ [0-9]+(\.[0-9]+)+?";"sed -r 's/fsck\.fat\ ([0-9]+(\
fatlabel;;gplv3;"^fatlabel\ [0-9]+(\.[0-9]+)+?";"sed -r 's/fatlabel\ ([0-9]+(\.[0-9]+)+?).*/dosfstools:\1/'";
mklost_plus_found;;unknown;"^mklost\+found\ [0-9]+(\.[0-9]+)+?\ \(.*\)$";"sed -r 's/mklost\+found\ ([0-9]+(\.[0-9]+)+?).*/e2fsprogs:\1/'";
mkntfs;;gplv2;"mkntfs\ [0-9]+(\.[0-9]+)+?";"sed -r 's/mkntfs\ ([0-9]+(\.[0-9]+)+?).*/ntfsprogs:\1/'";
mkntfs;;gplv2;"^mkntfs\ v[0-9]+(\.[0-9]+)+?";"sed -r 's/mkntfs\ ([0-9]+(\.[0-9]+)+?).*/ntfsprogs:\1/'";
Copy link
Member

Choose a reason for hiding this comment

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

could we simplify this in the following way?

└─$ echo "mkntfs 1.2.3" | grep -E "mkntfs\ [0-9]+(\.[0-9]+)+?"
mkntfs 1.2.3
                                                                                                                                                                                                             
┌──(m1k3㉿emba)-[~/firmware-stuff/EMBAbite]
└─$ echo "mkntfs v1.2.3" | grep -E "mkntfs\ (v)?[0-9]+(\.[0-9]+)+?"
mkntfs v1.2.3

I think in your sed regex the "v" is missing

@m-1-k-3
Copy link
Member

m-1-k-3 commented Mar 29, 2023

As reference. This PR should also solve #464

@m-1-k-3 m-1-k-3 merged commit 6ba8205 into e-m-b-a:master Apr 3, 2023
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