JRE is now default

panther7 · May 21, 2021 · 9716f18 · 9716f18
1 parent 5778662
commit 9716f18
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 37 deletions.
diff --git a/build.xml b/build.xml
@@ -133,8 +133,8 @@
 					<!-- exclude binary files so they don't get mangled (see https://ant.apache.org/manual/Tasks/copy.html#encoding) -->
 					<not>
 						<or>
-							<name name="**/*.png" />
-							<name name="**/*.gif" />
+							<name name="*.png" />
+							<name name="*.gif" />
 						</or>
 					</not>
 				</restrict>
@@ -152,8 +152,8 @@
 				<restrict>
 					<filesets />
 					<or>
-						<name name="**/*.png" />
-						<name name="**/*.gif" />
+						<name name="*.png" />
+						<name name="*.gif" />
 					</or>
 				</restrict>
 				<filtermapper>

diff --git a/package.properties b/package.properties
@@ -1,5 +1,5 @@
 package: java-installer
-version: 2.16
+version: 2.17
 maintainer: [email protected]
 
 title: Java Installer

diff --git a/release/get-java.ps1 b/release/get-java.ps1
@@ -3,7 +3,7 @@
 
 param (
 	[string]$command = 'get',
-	[string]$type = 'jdk',
+	[string]$type = 'jre',
 	[string]$arch = 'x86_64',
 	[string]$os = 'Windows',
 	[string]$out

diff --git a/release/get-java.ps1.asc b/release/get-java.ps1.asc
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQJLBAABCAA1FiEE4n46YFwjrRTAJJ31CPJHesb2YlgFAmCnk1QXHGZpbGlwLm1v
-c25lckBzZXpuYW0uY3oACgkQCPJHesb2Ylj2KBAAjGKd735DwUdq8Z1m4D/xl5hV
-11WT1nKPC2w5UhmWwL8UwdOFlMERe5lNTSw+gb8O1KqergQJ0DICfZBIyuBrAxXH
-lQW0wiD0v/DU7vJUte1P0u7LcCtURjzMf/GE1FMxsh+HCDFekM6Efr2EuuFFilbX
-dtToqlaFVTVqojHRKZBgW4DZaqixaIknD6IS0P1OgpyrkJ6CocB7VUKkaTuKP/Ie
-51qnzyqJP5j4MUhJy2Id854ohC/X2oyUY0F37hRvqmpicizMbDBL5UtMwg7r1OH8
-NoMKBZHBUStiMCOI765w1h6oYbmHKe6p6Ec0AM/l0NZkFW3UeMjTbt9LdxVi7TNi
-CvWW55OrQDTmDZlo1PDRqZPp9NzCPWuLe8Kb0oM3QuEvPAT77fEoFdQMuMQQpU61
-Ysx0qOsg4wfV/uff8E0usSpE84xNLFmXFfoQ8mV2FjXkpZFZxZbAa0vLFQI6lcfi
-kXjHpihLQO5Fn6jb4NUgASs2ECVsB9mUmFDHxqEO6yu/iPPQR11AzlIfPC5Pp35C
-zbYTjrDue3+EZieaudoIoKjNGfCcnrwcCoxgFtEIbgeesG2HugG4DSSi+QBQyheh
-nXIU6Xgmt0myDBu9bYgp3MtWlm7VwRK4GKjdgFoKhWQyuNfAXZkUIRJtN830bRK9
-2mjaR5pOQ1KLc/pnofI=
-=QzF4
+iQJLBAABCAA1FiEE4n46YFwjrRTAJJ31CPJHesb2YlgFAmCnmNQXHGZpbGlwLm1v
+c25lckBzZXpuYW0uY3oACgkQCPJHesb2YljvlA/+IeYPVFZmFRY3a6tE3l3bzC4a
+ff2SCVH+VNhx/ceMV1sDIkZcFOb5AhLZnrxer291VEYbsZDiFUADtg82KPaYMVmU
+X4blOy0Ogz+AQA4Fdq+PWt4+FlteodzL7orFsPOdbbGzSYS8TZBqKgUcnO2F2RHj
+SLX7BB1tLhSXIDV5Ur77OAkY7Ip4va9YfBkfpNaRKt1wZht5G/fm32KV4jFanxnV
+qFr3FrfGWDC07I6Ho5P+nN+aFqIxohqemQGlhyCt2TL4diKNPO8IcNNaKuaTtSG9
+QBWdqET/WhkpBJ/WheASIi5SQgNce2QnG/X1NXwpD+UNNsuoZVEjjA3/EzMGACPl
+EknALno0CrvZwAamKI9lxfsiQ6akhD/Adh1e5jjnQhjzYJMAOfQPWDKwAIlA7ciL
+lbP70bSt0EQaytOo7jZ0rSHgg3UYIUeadjYrBhLBLhTPrrttOj87z03tz4pUwNvw
+4VrCrf4dkO08xWGk7A+2WobRlblQ/r634tbaSJx0shuvS2cVThpNQN+HLx64N2Gp
+3I49h/EneZCJa5IrsBkpZ7xnER2Kj+JHe39K0zT62p1Ns+xmD1vpPCYRajcDc1aj
+AQFXwfwuRDaTgEpKViOKVpHBQt7XBZ65pz9or2V8oRmaWoGemKCpRL/E8mdU5bhF
+/B3fFUKM65uuNOjVc4Y=
+=O2B9
 -----END PGP SIGNATURE-----
diff --git a/release/get-java.sh b/release/get-java.sh
@@ -3,7 +3,7 @@
 # Java Installer for OpenJDK 16.0.1
 
 COMMAND=${1:-get}        # get | install
-TYPE=${2:-jdk}           # jre | jdk
+TYPE=${2:-jre}           # jre | jdk
 ARCH=${3:-`uname -m`}    # x86_64 | i686 | aarch64 | armv7l | etc
 OS=${4:-`uname -s`}      # Linux | Darwin | Windows | etc
 

diff --git a/release/get-java.sh.asc b/release/get-java.sh.asc
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQJLBAABCAA1FiEE4n46YFwjrRTAJJ31CPJHesb2YlgFAmCnk1QXHGZpbGlwLm1v
-c25lckBzZXpuYW0uY3oACgkQCPJHesb2YljNBg//bWm8nZTK80a6QV9GBfAVtLoz
-pDfgByftF7dsX5vRDN0HkWEJRSwFcx2YAaQ2nGITR63tn410lLPe2t+SfwVJMFsu
-vA35mDRYoomKMlPKxDj9c0m2I8LD/sGzY0KfDfDbmm6p+zREFmwuI5jL0WCbr0rW
-VicP3yLZS5mUAiTFnifMjTS45MQPthJt2P7lgd7SBjA7bsxwVLx7Izih/hX0zLAS
-PXd881cJavJPu4/li47yQkWoetdkgjJ56yGMuwCsz9jngUHuJrafadcjdP+cGHzK
-MKQxFJwKXay75uu+yY9DBLaRoeGPgeV3z4RxRlfErkOd9MhnB4BlWdRVBDZdwo0r
-MqYMUqL6on0GKcRVUuk7BvZu5Ek3knyrOgXqcKW6PKTByM8R7de8pSkA7OIkcY7/
-uCwffKYovg4KS63K8VmEbU8Q1/Aav8tbny/pUgyqTcCFF+UMQOva7FihR6kbWrME
-/BEumkrNCzLIf7T0YNkJxvyRl/jDFLo2upb0XjRbEtkKxKKHIY6ieqSrJC3E/XN0
-TMsXd7G9RCuEtl9RvucSFJJTV9gBRkzqH9RjokhjmWYGnzcxPob2xndJiYQ+100H
-hbzHaUhzQyQuWGU1bRrxLGTJYKge8APKIMsPPmJw6fLokM+JLo2k8zjSeZtxgkCO
-gBaFbeRFGwpOSeE5egw=
-=/kjp
+iQJLBAABCAA1FiEE4n46YFwjrRTAJJ31CPJHesb2YlgFAmCnmNQXHGZpbGlwLm1v
+c25lckBzZXpuYW0uY3oACgkQCPJHesb2Ylhj7A/6A7sBmupDquUpa2bm1CaIEGsL
+9Dx015Q3t9XpJzY94BfIEFCRw7EzSu3TFIeppm6x1GufItVaGzEqqzKEvsAhKuvD
+sHNebNIVQKZIXHrwYMlOUoYEchnadEe3bP04QqtgfwUIHn+qy3YS+vgpmnPrjhxW
+QMx0I7prCxQUvgvi46K5F1mw3b0gxjuEx0c5IsBsN+vLlwI9ow6DFIBfZ/oo24c8
+F6GoVSYq7hRRY2BYXshC4Ot9lDPuk3d6HhxnzUhVtGCfke/8LLUe7qsl5ZBTEU+v
+uJbOpWVNkTAvYm2G46E/qWMb6irn84B7eI1KHEjAWoOYpUfAv1+FvD5HVnjpIQ+T
+6HggWWMW8+BHQtoHoe+9CpaA2vnUjXlAZsc3RcWBKKWSaWFcfbbiysPHYao/r9DS
+rL7ijbv325QAjpK3kXzyPcCbL/ySLGxVPGpRxfhSoYf/MhQdMV2VaJvDv2JyqMNI
+o8ic2abbt241zQuB/jWZ4a80VmMosybrR0cPnCTGjwmSLjTNaTmEBywPv8FVhCBZ
+EaYpKEZ92AJi5nSmOT9gY6RjfleJdDfSMm3zvxJpPrFcyMrjOFRYOeWjphrf56vo
+ZP5AjZjil+dlH0T6/2AUCAjR7WSH+BawpvyChHCqcPCqHQ2lUKZTxY94LbIZsO7G
+maAeUVeb7NnuigwupBU=
+=wzwk
 -----END PGP SIGNATURE-----
diff --git a/src/get-java.ps1 b/src/get-java.ps1
@@ -3,7 +3,7 @@
 
 param (
 	[string]$command = 'get',
-	[string]$type = 'jdk',
+	[string]$type = 'jre',
 	[string]$arch = 'x86_64',
 	[string]$os = 'Windows',
 	[string]$out

diff --git a/src/get-java.sh b/src/get-java.sh
@@ -3,7 +3,7 @@
 # @{title} for @{jdk.name} @{jdk.version}
 
 COMMAND=${1:-get}        # get | install
-TYPE=${2:-jdk}           # jre | jdk
+TYPE=${2:-jre}           # jre | jdk
 ARCH=${3:-`uname -m`}    # x86_64 | i686 | aarch64 | armv7l | etc
 OS=${4:-`uname -s`}      # Linux | Darwin | Windows | etc