From 6ec87f89ef26b1b801923c82cf4afdf8e608fd7b Mon Sep 17 00:00:00 2001 From: Martijn Verburg Date: Thu, 4 Oct 2018 12:45:25 +0100 Subject: [PATCH] minor formatting --- sbin/Release.sh | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sbin/Release.sh b/sbin/Release.sh index 0ff1faa..5bd1d58 100755 --- a/sbin/Release.sh +++ b/sbin/Release.sh @@ -19,20 +19,17 @@ npm install versionRegex="[[:digit:]]{2}_[[:digit:]]+|8u[[:digit:]]+-b[[:digit:]]+|[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+_[[:digit:]]+" timestampRegex="[[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}-[[:digit:]]{2}-[[:digit:]]{2}" -# -# OpenJDK 8U_ -jdk x64_ Linux_ hotspot_ 2018-06-15-10-10 .tar.gz -# OpenJDK 11_ -jdk x64_ Linux_ hotspot_ 11_28 .tar.gz +# OpenJDK 8U_ -jdk x64_ Linux_ hotspot_ 2018-06-15-10-10 .tar.gz +# OpenJDK 11_ -jdk x64_ Linux_ hotspot_ 11_28 .tar.gz regex="OpenJDK([[:digit:]]+)U?(-jre|-jdk)_([[:alnum:]]+)_([[:alnum:]]+)_([[:alnum:]]+).*_($timestampRegex|$versionRegex).(tar.gz|zip)"; regexArchivesOnly="${regex}$"; - # Date format is YYYY-MM-DD-hh-mm, i.e 2018-06-15-10-10. # So files will look like: # OpenJDK8U_x64_Linux_hotspot_2018-06-15-10-10.tar.gz # OpenJDK8U_x64_Linux_hotspot_2018-06-15-10-10.tar.gz.sha256.txt # OpenJDK8U_x64_Linux_openj9_2018-06-15-10-10.tar.gz # OpenJDK8U_x64_Linux_openj9_2018-06-15-10-10.tar.gz.sha256.txt - TIMESTAMP="$(date -u +'%Y-%m-%d-%H-%M')" # Rename to ensure a consistent timestamp across release @@ -45,7 +42,7 @@ do newName=$(echo "${file}" | sed -r "s/${timestampRegex}/$TIMESTAMP/") if [ "${file}" != "${newName}" ]; then - # Rename archive and checksum file with now timestamp + # Rename archive and checksum file with new timestamp echo "Renaming ${file} to ${newName}" mv "${file}" "${newName}" mv "${file}.sha256.txt" "${newName}.sha256.txt" @@ -54,7 +51,6 @@ do sed -i -r "s/^([0-9a-fA-F ]+).*/\1${newName}/g" "${newName}.sha256.txt" fi - FILE_VERSION=${BASH_REMATCH[1]}; FILE_TYPE=${BASH_REMATCH[2]}; FILE_ARCH=${BASH_REMATCH[3]};