fix broken if condition with modified xorg.conf

[fennifith]

Fixes issue #56 - found a way to use grep to check for "if the output contains this specific word", which I think was the original intent of that functionality. Chaining cat | grep | cut | grep does seem a bit complex, I'm not sure if there's a simpler way to achieve this - but it should fix the problem, anyway.

[hertg]

Hey, thanks for the PR!
I can't look at it right now, I might be able to do that on the weekend. 😄

@ewagner12
Just wanted to notify you as it's a change to the code you submitted. Let me know if you have any feedback

[ewagner12]

Hi, I'm ok with this PR as it seems to work ok with my system, but speaking of cleaner solutions, how about this:
if [ ${mode} = "egpu" ] && ! cat $xfile_egpu | grep -Eiq 'Driver[[:space:]]*\"nvidia'; then
let me know if replacing the problem line with that would fix your issue as well.

You're correct that it's supposed to look for the single word "nvidia" in the xorg.conf.egpu file and only go into the if statement only if it doesn't find it. Specifically, this was designed so that AMD cards or nvidia cards using the open source "nouveau" driver would go into the if statement, but nvidia cards using the proprietary "nvidia" driver won't.

[hertg]

Thanks for you feedback.

You're correct that it's supposed to look for the single word "nvidia" in the xorg.conf.egpu file and only go into the if statement only if it doesn't find it.

Depending on that statement, i believe we could simplify the regex so it matches whenever the word nvidia is found on the Driver line, right? So my proposal would be to change the regex itself to simply Driver.*nvidia. @ewagner12 Do you see any problems with that?

Also, I just realized that piping the cat output into grep seems unnecessary, we could change that to pass the file directly as a grep argument: grep -Eiq 'Driver.*nvidia' $xfile_egpu.

The full line being:

# when mode is 'egpu' and no 'nvidia' driver is used
if [ ${mode} = "egpu" ] && ! grep -Eiq 'Driver.*nvidia' $xfile_egpu; then

Please report if I missed anything.

@fennifith Would be great if you could give your feedback and test my proposal on your system. If that works well for you, you could push a new commit with that change and I'll then accept the PR.

[fennifith]

Yep, this works for me! Definitely an improvement over my original fix :)
I will commit that momentarily.

I believe this does mean that any driver containing "nvidia" will also be matched (which was not the case before), such as other-nvidia or, idk, nounvidiau if someone horribly misspells nouveau - but I don't know of any other drivers named as such (and if there are, this behavior might be desirable anyway).