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

Fix Neofetch output to display Pop! instead of Ubuntu #56

Merged
merged 3 commits into from
Apr 22, 2019

Conversation

mmstick
Copy link
Member

@mmstick mmstick commented Apr 19, 2019

In 19.04, neofetch and lsb_release, and possibly others, are now reading from /usr/lib/os-release instead of /etc/os-release. According to the freedesktop spec, /etc/os-release is supposed to take precedence over /usr/lib/os-release, and only fall back to /usr/lib/os-release if /etc/os-release is missing. lsb_release and neofetch seem to be exhibiting broken behavior in that regard.

This will add a symlink at /usr/lib/os-release so that applications using either /etc/os-release or /usr/lib/os-release will get the correct os-release.

markolo25
markolo25 previously approved these changes Apr 20, 2019
cameronaaron
cameronaaron previously approved these changes Apr 20, 2019
Copy link

@cameronaaron cameronaaron left a comment

Choose a reason for hiding this comment

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

Looks good

Copy link
Member

@jackpot51 jackpot51 left a comment

Choose a reason for hiding this comment

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

We still have to dpkg-divert the files

@mmstick
Copy link
Member Author

mmstick commented Apr 20, 2019

The dpkg-divert has been added.

@jackpot51
Copy link
Member

Are there other dpkg-diverts in other scripts

Seems in 19.04, neofetch, and possibly others, are now readying from `/usr/lib/os-release` instead of `/etc/os-release`.
@mmstick
Copy link
Member Author

mmstick commented Apr 20, 2019

Yes, the prerm had a diversion which I've adjusted now.

@jackpot51
Copy link
Member

Thanks, I am going to do some cleanup on this and then merge it

@jackpot51 jackpot51 requested a review from brs17 April 22, 2019 14:58
Copy link
Member

@jackpot51 jackpot51 left a comment

Choose a reason for hiding this comment

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

I tested functionality on my own system

@jackpot51
Copy link
Member

neofetch

Copy link
Contributor

@brs17 brs17 left a comment

Choose a reason for hiding this comment

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

@mmstick mmstick merged commit bf868ef into master_disco Apr 22, 2019
Pop!_OS automation moved this from Ready to test to Staging Apr 22, 2019
@mmstick mmstick deleted the neofetch_disco branch April 22, 2019 15:58
@jackpot51 jackpot51 moved this from Staging to Done in Pop!_OS Apr 26, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Pop!_OS
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

5 participants