Skip to content

Delete leftover leading empty lines in config files

Andreas Klauer requested to merge frostschutz/xdm:fix-config-whitespace into master

Hi,

on my ArchLinux system I notice the config files have a ton of unwanted whitespace (empty lines), so many that the files would seem empty at first glance when opening in an editor. For example some of the config files start with a #!/bin/sh shebang and that would end up on line 40+ instead of line 1.

So I added to the existing CPP_SED_MAGIC to remove the leading empty lines.

Before:

$ grep -n '#!' config/*
config/Xreset:45:#!/bin/sh
config/Xsession:45:#!/bin/sh
config/Xstartup:45:#!/bin/sh

After:

$ grep -n '#!' config/*
config/Xreset:1:#!/bin/sh
config/Xsession:1:#!/bin/sh
config/Xstartup:1:#!/bin/sh

It also removes leading empty lines from xdm-config, but not all of them due to the way it uses ! before #ifndef

So this is not a complete fix, but if cpp has a way to not print unwanted output, I have not seen it at first glance (and is probably the reason for CPP_SED_MAGIC in the first place?)

Regards,
Andreas Klauer

Signed-off-by: Andreas Klauer Andreas.Klauer@metamorpher.de

Merge request reports