Making grep -q -e -e usable on solaris

[judovana]

replacing -q by /dev/null
repalcing double -e by or in regex itself

[sxa]

Putting a block on this purely because it was a problem I reported and I want to verify that it works before anyone merges it ;-) It also may require egrep instead of grep but the linter will likely whinge about that.
Will test tomorrow - thanks for the quick turnaround @judovana

[judovana]

Sure!

…

-- Mgr. Jiri Vanek ***@***.***

---------- Původní e-mail ---------- Od: Stewart X Addison ***@***.***> Komu: adoptium/temurin-build ***@***.***> Kopie: judovana ***@***.***>, Mention ***@***.***> Datum: 2. 5. 2024 20:46:19 Předmět: Re: [adoptium/temurin-build] Making grep -q -e -e usable on solaris (PR #3788) " @sxa requested changes on this pull request. Putting a block on this purely because it was a problem I reported and I want to verify that it works before anyone merges it ;-) Will test tomorrow - thanks for the quick turnaround @judovana (https://github.com/judovana) — Reply to this email directly, view it on GitHub (#3788 (review)) , or unsubscribe (https://github.com/notifications/unsubscribe-auth/AAWFCS2DRW2YGTUNLBEY5XDZAKCXLAVCNFSM6AAAAABHEHJG66VHI2DSMVQWIX3LMV43YUDVNRWFEZLROVSXG5CSMV3GSZLXHMZDAMZWGYYDKMRUGM) . You are receiving this because you were mentioned. Message ID: <adoptium/ ***@***.***> "

[karianna]

ERROR the following files don't have a valid license header:
.github/workflows/semgrep_diff.yml

Is unrelated

[judovana]

Thanx @karianna I was wondering....

[judovana]

@sxa I had make it much nicer to move that or to regex. The only disadvantage is that it is now unreadable:( and -E is not reliable over distros. But with that explanation in echo just on another line it should be ok

[sxa]

I'm getting:

The mandatory repo argument has a very strict format 'jdk[0-9]{1,3}[u]{0,1}' or just plain 'jdk' for tip. 'jdk8u' does not match.

from this change on Solaris - that's from
just running ./make-adopt-build-farm.sh jdk8u without any additional parameters

A bit if diagnoses shows that echo jdk8u | grep '^\(jdk\|jdk[0-9]\{1,3\}[u]\{0,1\}\)$' returns nothing on Solaris' grep

EDIT: The first version with the two separate checks looks ok though - echo jdk8u | grep "^jdk[0-9]\\{1,3\\}[u]\\{0,1\\}$" finds the string correctly.

[judovana]

Hm

echo jdk8u | grep '^\(jdk\|jdk[0-9]\{1,3\}[u]\{0,1\}\)$'
jdk8u

I do nothave soalris around to try it up. maybe -E and removal of slashes can help, Maybe try it in the previous 669a1a5 revision. Generally I'mm running out of ideas.

[sxa]

Hm

echo jdk8u | grep '^(jdk|jdk[0-9]{1,3}[u]{0,1})$'
jdk8u

I do nothave soalris around to try it up. maybe -E and removal of slashes can help, Maybe try it in the previous 669a1a5 revision. Generally I'mm running out of ideas.

Yeah I think I'd vote for using the previous revision at this point - it's a bit messy using two variables but it's reasonably clear and should work everywhere.

[judovana]

The 669a1a5 really worked for you??? and others had not? /me amazed. WIll remove the second commit then

[sxa]

The 669a1a5 really worked for you??? and others had not? /me amazed. Will remove the second commit then

Purely on the basis of running this on solaris: echo jdk8u | grep "^jdk[0-9]\\{1,3\\}[u]\\{0,1\\}$" is true ($?=0) and the same using echo jdk8x at the start gives $?=1 so I think that's good enough if you're happy with it :-)

[sxa]

Failing github check seems to be covered by #3789 and not relevant to this PR

[judovana]

Ok. added comment on this topic to the code. Ok by me, plesae review/merge as necessary.

[karianna]

suggested wording change

[judovana]

Thank you. I keep learning.