Commit 77d24efe authored by Slugger@Github's avatar Slugger@Github
Browse files

Go figure, it wasn't a JRE bug afterall... sort of

Relative paths are platform dependant and OpenJDK on x86_64 --
the platform I dev on -- handles the relative paths like a champ.
Many other platforms in the Alpine universe do not handle it the
same way.  This patch should fix that up and will fix it upstream
in a future release.
parent 969653a4
Pipeline #66367 passed with stages
in 23 minutes and 52 seconds
......@@ -9,7 +9,7 @@ arch="noarch"
license="GPL-3.0-or-later"
makedepends="git openjdk8"
depends="wireguard-tools openjdk8-jre-base sudo iputils"
source="groovy-file-bug.patch"
source="build-file-bugs.patch"
install="$pkgname.pre-install $pkgname.post-install"
subpackages="$pkgname-doc $pkgname-openrc"
builddir="$srcdir/piawgmgr"
......@@ -45,4 +45,4 @@ package() {
install -m644 -D "$_apkoutdir"/piawgmgr.man.gz "$pkgdir"/usr/share/man/man1/piawgmgr.gz
}
sha512sums="c3158c3aadb6b75757ed5730397a11e271e5a14a58047db17d1d93cc6edb9d429eb654c6495726ea96e1910b66305112cdc99efd9ef7f6297285188d3ad3f523 groovy-file-bug.patch"
sha512sums="c4e95568aa6305ebda23ffab55a262d4511abdaff1af9873c772bba23f87b43238600636764f344899fd0e81463bc41e0b34a7f7a8b6d9d5732f5f2911b7e545 build-file-bugs.patch"
diff --git a/build.gradle b/build.gradle
index d93b477..5cf95ca 100644
index d93b477..4b686cb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,6 +32,8 @@ versioning {
......@@ -11,11 +11,22 @@ index d93b477..5cf95ca 100644
}
group = 'com.github.slugger.vpn.pia'
@@ -68,6 +70,7 @@ task mkver {
@@ -66,7 +68,8 @@ bootDistTar {
task mkver {
doLast {
def f = new File('build/full.ver')
- def f = new File('build/full.ver')
+ def f = new File(buildDir, 'full.ver')
+ f.parentFile.mkdirs()
f.delete()
+ f.createNewFile() // JRE on some platforms refuses to write unless the file already exists
f << versioning.info.full
}
@@ -74,7 +77,7 @@ task mkver {
versionFile {
dependsOn mkver
- file = new File('src/main/resources/version.properties')
+ file = new File(projectDir, 'src/main/resources/version.properties')
}
processResources {
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment