Skip to content

Commit 466c692

Browse files
committed
scripts: accept java25 as runtime environment
Motivation: evolution Modification: Update dcache startup scripts to accept java25 Result: sites can use java25 to run dcache Acked-by: Lennart Sack Target: master Require-book: no Require-notes: yes
1 parent 5c9d83c commit 466c692

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

skel/share/lib/loadConfig.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ findJava()
5454

5555
isJavaVersionOk()
5656
{
57-
# Should match 17-21 which will let java major versions 17 to 21 through.
57+
# Should match 17-25 which will let java major versions 17 to 25 through.
5858
# Extract just the version number from 'java -version'
5959
version=$($JAVA -version 2>&1 | awk -F '"' '/version/ {print $2}')
6060
# Use grep to match against '^1[1-9].*$'
61-
echo "$version" | grep -q "^1[7-9].*$\|^2[0-1].*$"
61+
echo "$version" | grep -q "^1[7-9].*$\|^2[0-5].*$"
6262
# Return result from the above grep (0 if successful, 1 if failed)
6363
return $?
6464
}
@@ -182,8 +182,7 @@ loadConfig()
182182

183183
# Get java location
184184
if ! findJava || ! isJavaVersionOk; then
185-
echo "Could not find usable Java VM. Please set JAVA_HOME to the path to Java 17-21"
186-
echo "or newer."
185+
echo "Could not find usable Java VM. Please set JAVA_HOME to the path to Java 17-25."
187186
exit 1
188187
fi
189188

0 commit comments

Comments
 (0)