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

Making grep -q -e -e usable on solaris #3788

Merged
merged 6 commits into from
May 5, 2024
Merged

Making grep -q -e -e usable on solaris #3788

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
669a1a5
Making grep -q -e -e usable on solaris
judovana May 2, 2024
8695cbc
Merged the two expressions to single regex
judovana May 3, 2024
534bddc
Revert "Merged the two expressions to single regex"
judovana May 3, 2024
df07f73
Added comment for future people who wish to make the regex and if nicer
judovana May 3, 2024
68c23ed
Merge branch 'master' into solarisRegex
karianna May 4, 2024
1035fe8
language changes fixes in common.sh
judovana May 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions sbin/common/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,12 @@ function setOpenJdkVersion() {
# The argument passed here have actually very strict format of jdk8, jdk8u..., jdk
# the build may fail later if this is not honoured.
# If your repository has a different name, you can use --version or build from dir/snapshot
local forest_name_check=0
echo "$forest_name" | grep -q -e "^jdk$" -e "^jdk[0-9]\\{1,3\\}[u]\\{0,1\\}$" || forest_name_check=$?
if [ ${forest_name_check} -ne 0 ]; then
local forest_name_check1=0
local forest_name_check2=0
# This two returns condition is there to make grep on solaris happy. -e, -q and \( and \| do not work on that platform
echo "$forest_name" | grep "^jdk[0-9]\\{1,3\\}[u]\\{0,1\\}$" >/dev/null || forest_name_check1=$?
echo "$forest_name" | grep "^jdk$" >/dev/null || forest_name_check2=$?
if [ ${forest_name_check1} -ne 0 ] && [ ${forest_name_check2} -ne 0 ]; then
echo "The mandatory repo argument has a very strict format 'jdk[0-9]{1,3}[u]{0,1}' or just plain 'jdk' for tip. '$forest_name' does not match."
echo "This can be worked around by using '--version jdkXYu'. If set (and matching) then the main argument can have any value."
exit 1
Expand Down
Loading