Remove UTF-8 trademark symbol from package description

[sven/java-package.git] / lib / oracle-jdk-doc.sh

diff --git a/lib/oracle-jdk-doc.sh b/lib/oracle-jdk-doc.sh
index 1cc6d8674e67713a4e31cfda03650ded9524049f..16ca42597cdb332a2b7af032375a76dcaba30311 100644 (file)
--- a/lib/oracle-jdk-doc.sh
+++ b/lib/oracle-jdk-doc.sh
@@ -3,17 +3,17 @@ oracle_j2sdk_doc_detect() {
   j2se_release=0
 
   # Update or GA release (jdk-7u25-apidocs.zip)
-  if [[ $archive_name =~ jdk-([0-9]+)(u([0-9]+))?-apidocs\.zip ]]
+  if [[ $archive_name =~ jdk-([0-9]+)(u([0-9]+))?-(apidocs|docs-all)\.zip ]]
   then
     j2se_release=${BASH_REMATCH[1]}
     j2se_update=${BASH_REMATCH[3]}
     if [[ $j2se_update != "" ]]
     then
       j2se_version_name="$j2se_release Update $j2se_update"
-      j2se_version=${j2se_release}u${j2se_update}
+      j2se_version=${j2se_release}u${j2se_update}${revision}
     else
       j2se_version_name="$j2se_release GA"
-      j2se_version=${j2se_release}
+      j2se_version=${j2se_release}${revision}
     fi
   fi
 
@@ -26,10 +26,10 @@ oracle_j2sdk_doc_detect() {
     if [[ $j2se_update != "" ]]
     then
       j2se_version_name="$j2se_release Update $j2se_update Early Access Release Build $j2se_build"
-      j2se_version=${j2se_release}u${j2se_update}~ea-build-${j2se_build}
+      j2se_version=${j2se_release}u${j2se_update}~ea-build-${j2se_build}${revision}
     else
       j2se_version_name="$j2se_release Early Access Release Build $j2se_build"
-      j2se_version=${j2se_release}~ea-build-${j2se_build}
+      j2se_version=${j2se_release}~ea-build-${j2se_build}${revision}
     fi
   fi
 
@@ -59,7 +59,7 @@ EOF
       j2se_found=true
       j2se_required_space=$(( $j2se_expected_min_size * 2 + 20 ))
       j2se_vendor="oracle"
-      j2se_title="Java™ Platform, Standard Edition $j2se_release Documentation"
+      j2se_title="Java Platform, Standard Edition $j2se_release Documentation"
 
       j2se_install=oracle_j2sdk_doc_install
       j2se_remove=oracle_j2sdk_doc_remove