i3lock-color: fix manpage-name and manpage #40095
Merged
Conversation
This file contains 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
- rename manpage from i3lock.1 to i3lock-color.1 - change "i3lock" to "i3lock-color" in manpage-synopsis
xeji
reviewed
May 7, 2018
| @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { | |||
| installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc MANDIR=\${out}/share/man"; | |||
| postInstall = '' | |||
| mv $out/bin/i3lock $out/bin/i3lock-color | |||
| mv $out/share/man/man1/i3lock.1 $out/share/man/man1/i3lock-color.1 | |||
| sed -i 's/^\.B i3lock$/.B i3lock-color/' $out/share/man/man1/i3lock-color.1 | |||
There was a problem hiding this comment.
This sed expression does not catch all instances of i3lock in the manpage, so it results in a mix. Please make sure the entire manpage consistently uses i3lock-color after patching.
| @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { | |||
| installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc MANDIR=\${out}/share/man"; | |||
| postInstall = '' | |||
| mv $out/bin/i3lock $out/bin/i3lock-color | |||
| mv $out/share/man/man1/i3lock.1 $out/share/man/man1/i3lock-color.1 | |||
| sed -i 's/^\.B i3lock$/.B i3lock-color/' $out/share/man/man1/i3lock-color.1 | |||
| ''; | |||
| meta = with stdenv.lib; { | |||
| description = "A simple screen locker like slock"; | |||
There was a problem hiding this comment.
While you're at it, can you please add a hint here on how this differs from regular i3lock, for example
"A simple screen locker like slock, enhanced version with extra color options"
(feel free to come up with a better wording).
There was a problem hiding this comment.
Ok. This will be in a separate pull-request.
complete name-change from i3lock to i3lock-color: - rename /etc/pam.d/i3lock to /etc/pam.d/i3lock-color - change "i3lock" to "i3lock-color" everywhere in the manpage
|
Now, I've completely renamed everything:
|
xeji
suggested changes
May 7, 2018
| @@ -25,6 +25,9 @@ stdenv.mkDerivation rec { | |||
| installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc MANDIR=\${out}/share/man"; | |||
| postInstall = '' | |||
| mv $out/bin/i3lock $out/bin/i3lock-color | |||
| mv $out/etc/pam.d/i3lock $out/etc/pam.d/i3lock-color | |||
There was a problem hiding this comment.
Please remove this line as it will cause problems with PAM authentication. The app starts PAM under the service name 'i3lock', so the file must be named /etc/pam.d/i3lock.
|
@GrahamcOfBorg build i3lock-color |
|
No attempt on aarch64-linux (full log) The following builds were skipped because they don't evaluate on aarch64-linux: i3lock-color Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: i3lock-color Partial log (click to expand)
|
|
Failure on x86_64-darwin (full log) Attempted: i3lock-color Partial log (click to expand)
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Motivation for this change
The manpage of i3lock-color should also be named i3lock-color (and not i3lock), and talk about i3lock-color (and not i3lock), so:
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)cc @garbas @malyn