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

linux/[a-g]: add more information link #6076

Merged
merged 12 commits into from
Jul 9, 2021
Merged

linux/[a-g]: add more information link #6076

merged 12 commits into from
Jul 9, 2021

Conversation

signed-log
Copy link
Contributor

@signed-log signed-log commented May 30, 2021

Partial fix for #6062 on the linux side of pages, with commits notarized by letters

  • The page (if new), does not already exist in the repo.
  • The page description includes a link to documentation or a homepage (if applicable).

@bl-ue bl-ue marked this pull request as draft May 30, 2021 18:56
Copy link
Collaborator

@marchersimon marchersimon left a comment

Choose a reason for hiding this comment

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

Great work, thanks. I rewieved everything until chage for now, more is comming as soon as I have time for it.

pages/linux/add-apt-repository.md Outdated Show resolved Hide resolved
pages/linux/addr2line.md Outdated Show resolved Hide resolved
pages/linux/amixer.md Outdated Show resolved Hide resolved
pages/linux/as.md Outdated Show resolved Hide resolved
pages/linux/beep.md Outdated Show resolved Hide resolved
pages/linux/brctl.md Outdated Show resolved Hide resolved
pages/linux/btrfs.md Outdated Show resolved Hide resolved
pages/linux/cal.md Outdated Show resolved Hide resolved
pages/linux/calc.md Outdated Show resolved Hide resolved
pages/linux/chage.md Outdated Show resolved Hide resolved
@bl-ue
Copy link
Contributor

bl-ue commented May 30, 2021

I converted this PR to a draft — feel free to undo that once you're ready for review, @Stig124 :)

@marchersimon marchersimon changed the title linux/*: fix links issue linux/*: add more information link May 30, 2021
@marchersimon marchersimon added mass changes Changes that affect multiple pages. page edit Changes to an existing page(s). labels May 30, 2021
@bl-ue
Copy link
Contributor

bl-ue commented May 30, 2021

@Stig124 you'll probably want to use https://github.com/tldr-pages/tldr/blob/main/scripts/set-more-info-link.py, if you're not already. It saves a lot of headache when dealing with the more infos 😅

@marchersimon
Copy link
Collaborator

marchersimon commented May 30, 2021

Oh, and also please have a look at https://lukwebsforge.github.io/tldri18n/#linux to see if any pages have translations. Those should also be updated. This can be done automatically with this script as @bl-ue just mentioned above by just running python scripts/set-more-info-link.py -p linux/command "link"

@signed-log
Copy link
Contributor Author

@Stig124 you'll probably want to use https://github.com/tldr-pages/tldr/blob/main/scripts/set-more-info-link.py, if you're not already. It saves a lot of headache when dealing with the more infos sweat_smile

Oh thanks

@signed-log
Copy link
Contributor Author

And that script is broken

@signed-log
Copy link
Contributor Author

scripts/set-more-info-link.py: line 7: labels: command not found
scripts/set-more-info-link.py: line 8: en:: command not found
scripts/set-more-info-link.py: line 9: bs:: command not found
scripts/set-more-info-link.py: line 10: da:: command not found
scripts/set-more-info-link.py: line 11: de:: command not found
scripts/set-more-info-link.py: line 12: es:: command not found
scripts/set-more-info-link.py: line 13: fa:: command not found
scripts/set-more-info-link.py: line 15: fr:: command not found
scripts/set-more-info-link.py: line 43: syntax error near unexpected token `('
scripts/set-more-info-link.py: line 43: `    f = os.path.normpath(__file__)'

@signed-log
Copy link
Contributor Author

If I have time I will fix that

@marchersimon
Copy link
Collaborator

@bl-ue in cases like this it probably would be easier to first add all links to the English pages and one we agree on all of them just run a script to automatically update the links in all translated pages. Wdyt?

@marchersimon
Copy link
Collaborator

@Stig124 did you run the script with ./scripts/set-more-info-link.py or python scripts/set-more-info-link.py?

@bl-ue
Copy link
Contributor

bl-ue commented May 30, 2021

@Stig124
That looks to me like you're running like ./set-more-info-link.py, which won't work because it's not a bash script. Run it like this:

python3 scripts/set-more-info-link.py -p linux/command.md "https://example.com"

@bl-ue
Copy link
Contributor

bl-ue commented May 30, 2021

@bl-ue in cases like this it probably would be easier to first add all links to the English pages and one we agree on all of them just run a script to automatically update the links in all translated pages. Wdyt?

@marchersimon Yeah, that sounds like a good idea. 👍🏻

@marchersimon
Copy link
Collaborator

@bl-ue why don't we just add #!/usr/bin/env python in the first line of the script to make it runnable with ./?

@signed-log
Copy link
Contributor Author

@Stig124
That looks to me like you're running like ./set-more-info-link.py, which won't work because it's not a bash script. Run it like this:

python3 scripts/set-more-info-link.py -p linux/command.md "https://example.com"

Why isn't the shebang set though?

@bl-ue
Copy link
Contributor

bl-ue commented May 30, 2021

@marchersimon that's a great idea.

@Stig124 simply because I've never though of it. Go ahead and open a PR to add it, if you'd like :). Use /usr/bin/env python3 though (not python).

@signed-log
Copy link
Contributor Author

I just f* up my branches on my fork, can't do the fix now

@bl-ue
Copy link
Contributor

bl-ue commented May 30, 2021

Why? I don't think so. Just open a PR for the https://github.com/Stig124/tldr/tree/sfix2 branch.

@signed-log
Copy link
Contributor Author

It has all of the link commits, so I'm unable

@signed-log
Copy link
Contributor Author

I put the fix in this commit

@bl-ue
Copy link
Contributor

bl-ue commented May 30, 2021

Ah, I see. Just checkout main, create a new branch, re-make the shebang change, PR.

git checkout main
git checkout -b set-more-info-link-py-shebang

<make changes ...>

git add scripts/set-more-info-link.py
git commit -m "set-more-info-link.py: add shebang"
git push -u origin set-more-info-link-py-shebang

<go to https://github.com/Stig124/tldr/pull/new/set-more-info-link-py-shebang>

@bl-ue
Copy link
Contributor

bl-ue commented May 30, 2021

I put the fix in this commit

I'd prefer that go in its own PR. Just leave it in this PR though, and make a new PR per my instructions above. Then, once it's merged, we'll update this PR, and that should essentially fix it all.

@marchersimon marchersimon removed the waiting Issues/PRs with Pending response by the author. label Jun 28, 2021
@signed-log
Copy link
Contributor Author

@Stig124 in case you don't have the time for it just tell us and we take over from there.

Yes please, sorry for not having been able to finish that PR @marchersimon

@marchersimon
Copy link
Collaborator

No problem at all. Thanks for the work so far.

@marchersimon marchersimon marked this pull request as ready for review June 28, 2021 19:15
@CleanMachine1
Copy link
Member

Ok, my review was requested so here it is:

GEdit, flatpak need fixing and if possible fsck

@marchersimon
Copy link
Collaborator

@CleanMachine1 I've already made suggestions for GEdit and flatpak. Are those links okay? And I don't see whats wrong with fsck.

@marchersimon marchersimon mentioned this pull request Jun 28, 2021
3 tasks
@CleanMachine1
Copy link
Member

Yes. However I have 1 more thing to mention. #6062 needs to have ALL ticked off. I am sure someone here can use some wizardry to auto do all of them here using a replace tool or whatever

@marchersimon
Copy link
Collaborator

Any thoughts on my suggestions above? If not I'll commit them.

@tldr-bot

This comment has been minimized.

@marchersimon marchersimon self-assigned this Jul 2, 2021
Copy link
Collaborator

@marchersimon marchersimon left a comment

Choose a reason for hiding this comment

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

All suggestions are applied and all translated pages are in sync. I think this PR is ready to be merged.

@CleanMachine1
Copy link
Member

Cant review on mobile from what I see but this has my approval

@marchersimon
Copy link
Collaborator

marchersimon commented Jul 9, 2021

It's possible to review by clicking on the 151 files changed on the top.

@marchersimon marchersimon added the translation Issues requesting translating pages from English to other languages. label Jul 9, 2021
@marchersimon marchersimon changed the title linux/*: add more information link linux/[a-g]: add more information link Jul 9, 2021
@marchersimon marchersimon merged commit 3697c62 into tldr-pages:main Jul 9, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
mass changes Changes that affect multiple pages. page edit Changes to an existing page(s). translation Issues requesting translating pages from English to other languages.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants