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.

Sign up for GitHub

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

Jump to bottom

Misc code reshuffle #49

Merged
merged 8 commits into from
Mar 29, 2023
Merged

Misc code reshuffle #49

merged 8 commits into from
Mar 29, 2023

Conversation

evelikov
Copy link
Contributor

Pure code motion - no functional changes intended.

  • stop mixing functions and sequential (?) code - keep functions at the top, everything else at the bottom
  • separate between user-selectable options and internal variables - the setup movement
  • couple other nitpicks

@evelikov evelikov mentioned this pull request Mar 26, 2023
Merged
@YHNdnzj
Copy link
Contributor

YHNdnzj commented Mar 26, 2023

Well kind of .... unlike mkinitcpio we have a clunky (m4) include, which makes the final code a complete mess.
Should probably move that instead.

Actually we may try to get rid of m4 completely, to switch to source common in runtime instead.

mkinitcpio is doing this already.

@evelikov
Copy link
Contributor Author

Actually we may try to get rid of m4 completely, to switch to source common in runtime instead.

The common is a complete misnomer since half of it isn't common at all. Generally having it a separate sourcable makes sense for something like mkinitcpio and less so here - there is a separate PR coming to unwrap that.

But overall one should really look at each of these things separately - as a man once said "divide and conquer"

@evelikov evelikov mentioned this pull request Mar 26, 2023
Merged
@evelikov
arch-chroot: move include_m4 after the globals
7101c55 
After the m4 substitution, the globals end up mixed misc functions.
Just keep them at the top for legibility.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
@evelikov
arch-chroot: stop interleaving functions and sequential code
a6765cc 
Makes it easier to reason about the code.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
@evelikov
arch-chroot: delay selecting chroot/unshare setup
3a8e3de 
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
@evelikov
genfstab: reshuffle while read loop
b07a157 
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
@evelikov
pacstrap: move include_m4 after the globals
6c68163 
After the m4 substitution, the globals end up mixed misc functions.
Just keep them at the top for legibility.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
@evelikov
pacstrap: stop interleaving functions and sequential code
c911fbf 
Makes it easier to reason about the code.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
@evelikov
pacstrap: delay selecting chroot/unshare setup
8af3fa3 
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
@evelikov
pacstrap: error out earlier, on invalid directory
c72a394 
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
@Foxboron
Copy link
Member

Thanks!

@Foxboron Foxboron merged commit 7e4e1c1 into archlinux:master Mar 29, 2023
@evelikov evelikov deleted the misc-reshuffle branch March 29, 2023 19:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@YHNdnzj YHNdnzj YHNdnzj left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@evelikov @YHNdnzj @Foxboron