From ac23e3048798535a6836085f136682ea0a6893ad Mon Sep 17 00:00:00 2001 From: altruios <49083558+altruios@users.noreply.github.com> Date: Mon, 30 Jan 2023 18:52:03 -0800 Subject: [PATCH 01/10] changed $pkgname.sh to $_patch.sh --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index d8d32db..d20617c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -18,5 +18,5 @@ build() { package() { cd "$pkgname-app-$pkgver" install -Dm755 "$srcdir/$pkgname-app-$pkgver/build/libs/$pkgname-app-$pkgver-1.0.0-all.jar" "$pkgdir/usr/share/java/${pkgname}/${pkgname}.jar" - install -Dm755 "$srcdir/$pkgname-app-$pkgver/$pkgname.sh" "$pkgdir/usr/bin/${pkgname}" + install -Dm755 "$srcdir/$pkgname-app-$pkgver/_patch.sh" "$pkgdir/usr/bin/${pkgname}" } From 081bda1df911f3d85935aed0017581d813b79b8d Mon Sep 17 00:00:00 2001 From: altruios Date: Tue, 31 Jan 2023 17:43:31 -0800 Subject: [PATCH 02/10] pkgbuild update (for testing) --- .gitignore | 3 ++- PKGBUILD | 32 ++++++++++++++++++++------------ 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 2e60b5c..4b464a4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .idea/ .gradle/ build/ -out/ \ No newline at end of file +out/ +/bin \ No newline at end of file diff --git a/PKGBUILD b/PKGBUILD index d20617c..2e1806d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,22 +1,30 @@ # Maintainer: Your Name -pkgname="particle-life" +pkgname="particle-life-app" pkgrel=1 -pkgver=v1.1.3 # todo: make automatic +pkgver=1 pkgdesc="GUI for Particle Life, a particle system showing life-like behaviour" arch=("x86_64") -url="https://github.com/tom-mohr/particle-life-app" +url="https://github.com/tom-mohr/$pkgname" license=('GPL') depends=('java-environment') -makedepends=('git' 'java-environment>=16') -source=("$pkgname.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz") +makedepends=('git' 'java-environment>=11') +source=("git+$url.git") md5sums=('SKIP') +pkgver() { + cd "$srcdir/$pkgname" + git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g' + +} build() { - cd "$pkgname-app-$pkgver" - chmod +x ./gradlew - ./gradlew shadowJar + cd "$srcdir/$pkgname" + chmod +x ./gradlew #make gradlew an executable + ./gradlew shadowJar #shadowJar wraps jar with libraries } package() { - cd "$pkgname-app-$pkgver" - install -Dm755 "$srcdir/$pkgname-app-$pkgver/build/libs/$pkgname-app-$pkgver-1.0.0-all.jar" "$pkgdir/usr/share/java/${pkgname}/${pkgname}.jar" - install -Dm755 "$srcdir/$pkgname-app-$pkgver/_patch.sh" "$pkgdir/usr/bin/${pkgname}" -} + cd "$pkgname-$pkgver" + #copy jar executable to main java location + #possible error in file name + install -Dm755 "$srcdir/$pkgname/build/libs/$pkgname-1.0.0-all.jar" "$pkgdir/usr/share/java/${pkgname}/${pkgname}.jar" + #copy and rename _patch to the package name + install -Dm755 "$srcdir/$pkgname/_patch.sh" "$pkgdir/usr/bin/${pkgname}" +} \ No newline at end of file From 7c5bc9bcd5b6eff99c4e6316a61bf79e2fbb23e2 Mon Sep 17 00:00:00 2001 From: alturios Date: Tue, 31 Jan 2023 22:10:02 -0800 Subject: [PATCH 03/10] patch name change --- _patch.sh | 2 ++ particle-life.sh | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 _patch.sh delete mode 100644 particle-life.sh diff --git a/_patch.sh b/_patch.sh new file mode 100644 index 0000000..3f772f2 --- /dev/null +++ b/_patch.sh @@ -0,0 +1,2 @@ +#!/bin/sh +exec /usr/bin/java -jar '/usr/share/java/particle-life-app/particle-life-app.jar' "$@" \ No newline at end of file diff --git a/particle-life.sh b/particle-life.sh deleted file mode 100644 index 7ceda5c..0000000 --- a/particle-life.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/bin/java -jar '/usr/share/java/particle-life/particle-life.jar' "$@" \ No newline at end of file From 7b17297854e8b9409d8baac3d1cf6cf185f15a0e Mon Sep 17 00:00:00 2001 From: alturios Date: Tue, 31 Jan 2023 22:20:28 -0800 Subject: [PATCH 04/10] pkgbuild for linux --- .SRCINFO | 20 ++++++++++++++++++++ PKGBUILD | 23 +++++++++++------------ 2 files changed, 31 insertions(+), 12 deletions(-) create mode 100644 .SRCINFO diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 0000000..849f335 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,20 @@ +Name : particle-life-app +Version : v1.1.3.r14.g37ec707-1 +Description : GUI for Particle Life, a particle system showing life-like behavior +Architecture : x86_64 +URL : https://github.com/tom-mohr/particle-life-app +Licenses : GPL +Groups : None +Provides : None +Depends On : java-environment +Optional Deps : None +Conflicts With : None +Replaces : None +Compressed Size : 44.32 MiB +Installed Size : 45.01 MiB +Packager : Unknown Packager +Build Date : Tue 31 Jan 2023 09:40:23 PM PST +Install Script : No +Validated By : None +Signatures : None + diff --git a/PKGBUILD b/PKGBUILD index 2e1806d..081445c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,4 +1,6 @@ -# Maintainer: Your Name +# Maintainer: Tom Mohr +# Maintainer: Altruios +# Contributor: SuperRyn <*@*.*> pkgname="particle-life-app" pkgrel=1 pkgver=1 @@ -7,24 +9,21 @@ arch=("x86_64") url="https://github.com/tom-mohr/$pkgname" license=('GPL') depends=('java-environment') -makedepends=('git' 'java-environment>=11') +makedepends=('git' 'java-runtime>=16') source=("git+$url.git") md5sums=('SKIP') pkgver() { - cd "$srcdir/$pkgname" - git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g' - + cd "$srcdir/$pkgname" + git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } build() { - cd "$srcdir/$pkgname" - chmod +x ./gradlew #make gradlew an executable - ./gradlew shadowJar #shadowJar wraps jar with libraries + cd "$srcdir/$pkgname" + chmod +x ./gradlew + ./gradlew shadowJar } package() { - cd "$pkgname-$pkgver" - #copy jar executable to main java location - #possible error in file name + cd "$srcdir/$pkgname" install -Dm755 "$srcdir/$pkgname/build/libs/$pkgname-1.0.0-all.jar" "$pkgdir/usr/share/java/${pkgname}/${pkgname}.jar" - #copy and rename _patch to the package name install -Dm755 "$srcdir/$pkgname/_patch.sh" "$pkgdir/usr/bin/${pkgname}" + install -Dm755 "$srcdir/$pkgname/README.md" "$pkgdir/usr/share/doc/${pkgname}" } \ No newline at end of file From 41ceaca5b3fcb53c274de0aaca5a4d201004c037 Mon Sep 17 00:00:00 2001 From: altruios <49083558+altruios@users.noreply.github.com> Date: Wed, 1 Feb 2023 08:08:29 -0800 Subject: [PATCH 05/10] license placed in correct spot --- PKGBUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/PKGBUILD b/PKGBUILD index 081445c..ab07c2d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -26,4 +26,5 @@ package() { install -Dm755 "$srcdir/$pkgname/build/libs/$pkgname-1.0.0-all.jar" "$pkgdir/usr/share/java/${pkgname}/${pkgname}.jar" install -Dm755 "$srcdir/$pkgname/_patch.sh" "$pkgdir/usr/bin/${pkgname}" install -Dm755 "$srcdir/$pkgname/README.md" "$pkgdir/usr/share/doc/${pkgname}" + install -Dm755 "$srcdir/$pkgname/LICENSE.md" "$pkgdir/usr/share/licenses/${pkgname}" } \ No newline at end of file From e99c7f3279702f07a4395b98584744a9c57a2054 Mon Sep 17 00:00:00 2001 From: altruios <49083558+altruios@users.noreply.github.com> Date: Wed, 1 Feb 2023 08:54:10 -0800 Subject: [PATCH 06/10] pkgbuild email and permisisons --- PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index ab07c2d..f9d2294 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: Tom Mohr +# Maintainer: Tom Mohr # Maintainer: Altruios -# Contributor: SuperRyn <*@*.*> +# Contributor: SuperRyn pkgname="particle-life-app" pkgrel=1 pkgver=1 @@ -25,6 +25,6 @@ package() { cd "$srcdir/$pkgname" install -Dm755 "$srcdir/$pkgname/build/libs/$pkgname-1.0.0-all.jar" "$pkgdir/usr/share/java/${pkgname}/${pkgname}.jar" install -Dm755 "$srcdir/$pkgname/_patch.sh" "$pkgdir/usr/bin/${pkgname}" - install -Dm755 "$srcdir/$pkgname/README.md" "$pkgdir/usr/share/doc/${pkgname}" - install -Dm755 "$srcdir/$pkgname/LICENSE.md" "$pkgdir/usr/share/licenses/${pkgname}" + install -Dm644 "$srcdir/$pkgname/README.md" "$pkgdir/usr/share/doc/${pkgname}" + install -Dm644 "$srcdir/$pkgname/LICENSE.md" "$pkgdir/usr/share/licenses/${pkgname}" } \ No newline at end of file From 18e1efcf65a2a1f8f06db20b5e0b5bd7e0199474 Mon Sep 17 00:00:00 2001 From: altruios <49083558+altruios@users.noreply.github.com> Date: Wed, 1 Feb 2023 08:56:11 -0800 Subject: [PATCH 07/10] Update .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4b464a4..e76af5c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,3 @@ .gradle/ build/ out/ -/bin \ No newline at end of file From 8135d29ccdbd45d744f4719a6fb1792230637c81 Mon Sep 17 00:00:00 2001 From: altruios <49083558+altruios@users.noreply.github.com> Date: Wed, 1 Feb 2023 08:58:43 -0800 Subject: [PATCH 08/10] path fix --- _patch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_patch.sh b/_patch.sh index 7ceda5c..3f772f2 100644 --- a/_patch.sh +++ b/_patch.sh @@ -1,2 +1,2 @@ #!/bin/sh -exec /usr/bin/java -jar '/usr/share/java/particle-life/particle-life.jar' "$@" \ No newline at end of file +exec /usr/bin/java -jar '/usr/share/java/particle-life-app/particle-life-app.jar' "$@" \ No newline at end of file From 040b7077e23bae3d5555be6b9cc8c9a2f2e2b929 Mon Sep 17 00:00:00 2001 From: altruios <49083558+altruios@users.noreply.github.com> Date: Wed, 1 Feb 2023 09:00:03 -0800 Subject: [PATCH 09/10] credit update --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index f9d2294..9e27d71 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer: Tom Mohr -# Maintainer: Altruios +# Contributor: Altruios # Contributor: SuperRyn pkgname="particle-life-app" pkgrel=1 From 7944895d1314aaffa53ea43146def08718061ab1 Mon Sep 17 00:00:00 2001 From: altruios <49083558+altruios@users.noreply.github.com> Date: Wed, 1 Feb 2023 09:09:14 -0800 Subject: [PATCH 10/10] no srcinfo file needed --- .SRCINFO | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 .SRCINFO diff --git a/.SRCINFO b/.SRCINFO deleted file mode 100644 index 849f335..0000000 --- a/.SRCINFO +++ /dev/null @@ -1,20 +0,0 @@ -Name : particle-life-app -Version : v1.1.3.r14.g37ec707-1 -Description : GUI for Particle Life, a particle system showing life-like behavior -Architecture : x86_64 -URL : https://github.com/tom-mohr/particle-life-app -Licenses : GPL -Groups : None -Provides : None -Depends On : java-environment -Optional Deps : None -Conflicts With : None -Replaces : None -Compressed Size : 44.32 MiB -Installed Size : 45.01 MiB -Packager : Unknown Packager -Build Date : Tue 31 Jan 2023 09:40:23 PM PST -Install Script : No -Validated By : None -Signatures : None -