Skip to content

Commit ef67990

Browse files
committed
Adjust "update.sh" output to match the more recent changes
1 parent b1233ee commit ef67990

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

update.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -342,15 +342,15 @@ EOD
342342
exit 1
343343
fi
344344
ojdkJavaVersion="$(echo "$ojdkbuildVersion" | cut -d. -f2,4 | cut -d- -f1 | tr . u)" # convert "1.8.0.111-3" into "8u111"
345-
(
346-
set -x
347-
sed -ri \
348-
-e 's/^(ENV JAVA_VERSION) .*/\1 '"$ojdkJavaVersion"'/' \
349-
-e 's/^(ENV JAVA_OJDKBUILD_VERSION) .*/\1 '"$ojdkbuildVersion"'/' \
350-
-e 's/^(ENV JAVA_OJDKBUILD_ZIP) .*/\1 '"$ojdkbuildZip"'/' \
351-
-e 's/^(ENV JAVA_OJDKBUILD_SHA256) .*/\1 '"$ojdkbuildSha256"'/' \
352-
"$version"/windows/*/Dockerfile
353-
)
345+
346+
echo "$version: $ojdkJavaVersion (windows ojdkbuild $ojdkbuildVersion)"
347+
348+
sed -ri \
349+
-e 's/^(ENV JAVA_VERSION) .*/\1 '"$ojdkJavaVersion"'/' \
350+
-e 's/^(ENV JAVA_OJDKBUILD_VERSION) .*/\1 '"$ojdkbuildVersion"'/' \
351+
-e 's/^(ENV JAVA_OJDKBUILD_ZIP) .*/\1 '"$ojdkbuildZip"'/' \
352+
-e 's/^(ENV JAVA_OJDKBUILD_SHA256) .*/\1 '"$ojdkbuildSha256"'/' \
353+
"$version"/windows/*/Dockerfile
354354
fi
355355

356356
travisEnv='\n - VERSION='"$version$travisEnv"

0 commit comments

Comments
 (0)