diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | ExecutableJAR.conf | 2 | ||||
| -rw-r--r-- | Java.conf | 2 | ||||
| -rw-r--r-- | PKGBUILD | 14 | ||||
| -rw-r--r-- | jarwrapper | 2 | ||||
| -rw-r--r-- | javawrapper | 4 |
6 files changed, 18 insertions, 18 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Wed Aug 24 11:03:22 UTC 2016 +# Wed Aug 24 11:07:18 UTC 2016 pkgbase = binfmt-java pkgdesc = register Java runners pkgver = 1 - pkgrel = 1 + pkgrel = 2 url = https://wiki.archlinux.org/index.php/Binfmt_misc_for_Java install = binfmt-java.install arch = any @@ -17,10 +17,10 @@ pkgbase = binfmt-java source = javawrapper source = javaclassname.c md5sums = a9385f6b3eb01b7433fef2741f1ce4c2 - md5sums = f2244ff951ce7318d0d6a94e3fdfa001 - md5sums = c05fb16044abfded174d8a4b17ce7d7c - md5sums = f5e6a48ef18b92b23a59bc51f60e310f - md5sums = 87f5c8c8dc4705493221be97654f2e13 + md5sums = 626e8d62686221f680f1fd774ef79788 + md5sums = af58337bcbf7894aed44ee156ee5ce67 + md5sums = 896eca5b9a01b55d1e2a0f60918f0ebc + md5sums = 72cb3b9942263188c78a659438be69a0 md5sums = c6ec75405623591f8c0dead3fa3c3595 pkgname = binfmt-java diff --git a/ExecutableJAR.conf b/ExecutableJAR.conf index 7afcdcf0b22d..6efd28a790e4 100644 --- a/ExecutableJAR.conf +++ b/ExecutableJAR.conf @@ -1 +1 @@ -:ExecutableJAR:E::jar::/usr/local/bin/jarwrapper: +:ExecutableJAR:E::jar::/usr/bin/jarwrapper: diff --git a/Java.conf b/Java.conf index 4656b6403a2c..a6f4359b69b7 100644 --- a/Java.conf +++ b/Java.conf @@ -1 +1 @@ -:Java:M::\xca\xfe\xba\xbe::/usr/local/bin/javawrapper: +:Java:M::\xca\xfe\xba\xbe::/usr/bin/javawrapper: @@ -1,6 +1,6 @@ pkgname=binfmt-java pkgver=1 -pkgrel=1 +pkgrel=2 pkgdesc='register Java runners' arch=(any) url='https://wiki.archlinux.org/index.php/Binfmt_misc_for_Java' @@ -9,10 +9,10 @@ depends=('java-runtime' 'systemd') source=('Applet.conf' 'ExecutableJAR.conf' 'Java.conf' 'jarwrapper' 'javawrapper' 'javaclassname.c') md5sums=('a9385f6b3eb01b7433fef2741f1ce4c2' - 'f2244ff951ce7318d0d6a94e3fdfa001' - 'c05fb16044abfded174d8a4b17ce7d7c' - 'f5e6a48ef18b92b23a59bc51f60e310f' - '87f5c8c8dc4705493221be97654f2e13' + '626e8d62686221f680f1fd774ef79788' + 'af58337bcbf7894aed44ee156ee5ce67' + '896eca5b9a01b55d1e2a0f60918f0ebc' + '72cb3b9942263188c78a659438be69a0' 'c6ec75405623591f8c0dead3fa3c3595') install=$pkgname.install @@ -23,7 +23,7 @@ build (){ package (){ cd "$srcdir" - install -d "$pkgdir/usr/lib/binfmt.d" "$pkgdir/usr/local/bin" + install -d "$pkgdir/usr/lib/binfmt.d" "$pkgdir/usr/bin" install -m644 'Applet.conf' 'ExecutableJAR.conf' 'Java.conf' "$pkgdir/usr/lib/binfmt.d/" - install -m755 'jarwrapper' 'javawrapper' 'javaclassname' "$pkgdir/usr/local/bin/" + install -m755 'jarwrapper' 'javawrapper' 'javaclassname' "$pkgdir/usr/bin/" } diff --git a/jarwrapper b/jarwrapper index ae544c687ef9..a2c732111506 100644 --- a/jarwrapper +++ b/jarwrapper @@ -1,5 +1,5 @@ #!/bin/bash -# /usr/local/bin/jarwrapper - the wrapper for binfmt_misc/jar +# /usr/bin/jarwrapper - the wrapper for binfmt_misc/jar # set path to java using JAVA_HOME if available, otherwise assume it's on the PATH JAVA_PATH=${JAVA_HOME:+$JAVA_HOME/jre/bin/}java diff --git a/javawrapper b/javawrapper index bfb67faec7e9..415ca54131c9 100644 --- a/javawrapper +++ b/javawrapper @@ -1,5 +1,5 @@ #!/bin/bash -# /usr/local/bin/javawrapper - the wrapper for binfmt_misc/java +# /usr/bin/javawrapper - the wrapper for binfmt_misc/java if [ -z "$1" ]; then exec 1>&2 @@ -8,7 +8,7 @@ if [ -z "$1" ]; then fi CLASS=$1 -FQCLASS=`/usr/local/bin/javaclassname $1` +FQCLASS=`/usr/bin/javaclassname $1` FQCLASSN=`echo $FQCLASS | sed -e 's/^.*\.\([^.]*\)$/\1/'` FQCLASSP=`echo $FQCLASS | sed -e 's-\.-/-g' -e 's-^[^/]*$--' -e 's-/[^/]*$--'` |