Fix gen install 1 - Githubissues

automate-lfs / jhalfs

Tools for running the Linux From Scratch book instructions

http://www.linuxfromscratch.org/alfs/

MIT License

66 stars 14 forks source link

Fix gen install 1 #14

Closed pierre-labastie closed 5 years ago

pierre-labastie commented 5 years ago

Changes proposed in this pull request:

BLFS/xsl/gen-install.xsl: use preceding/following instead of preceding-sibling/following-sibling. But limit to nodes having a common sect2 ancestor. This allows finding the preceding or following screen tags, only when they are in the install role. Fixes #13
BLFS/xsl/scripts.xsl: fix a just discovered bug: when a double ampersand is removed, only remove trailing spaces, and not leading ones.

@automate-lfs/automate-lfs-repo-admins

pierre-labastie commented 5 years ago

@jhuntwork or @bryan5989, do you want to test, or should I merge now?

pierre-labastie commented 5 years ago

Seems nobody wants to comment. Will do some more tests before merging.

jhuntwork commented 5 years ago

Apologies, I've just been really busy the last few days. I'll try to take a look in a little bit.

jhuntwork commented 5 years ago

Looks good to me. I really like all the details and the description you provide, in both the pull request description above, and in the related issue.

I haven't worked with xsl in a long time, and it's been a while since I looked at the book's structure. I also haven't tested the blfs portions of jhalfs. But your changes and reasons for change look good.

I'd be happy to merge it if you want. Would you prefer me to do it or for you to merge it yourself?

pierre-labastie commented 5 years ago

Let me merge it. It's mainly maintenance. I expect {B,}LFS editors to use master, so I owe them fixing my bugs...

SheepReaper commented 5 years ago

likewise, been busy. Sorry for being aloof.

On Tue, May 7, 2019 at 11:15 AM Pierre Labastie notifications@github.com wrote:

Merged #14 https://github.com/automate-lfs/jhalfs/pull/14 into master.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/automate-lfs/jhalfs/pull/14#event-2324560164, or mute the thread https://github.com/notifications/unsubscribe-auth/ABLQ6JJEUE3YER5CA5NRTJ3PUGMJ3ANCNFSM4HJ7ABOQ .