This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-tools.git
The following commit(s) were added to refs/heads/master by this push:
new 4df803d Fix using old NB16u1 Gradle Tooling after installing NB17 via
Snap
4df803d is described below
commit 4df803d37031f6c52b748421cc49614392405a90
Author: Laszlo Kishalmi <laszlo.kisha...@partech.com>
AuthorDate: Tue Mar 7 11:43:32 2023 -0800
Fix using old NB16u1 Gradle Tooling after installing NB17 via Snap
---
snap-packages/from-source/snapcraft-template.yaml | 2 +-
snap-packages/from-zip/snapcraft-template.yaml | 2 +-
snap-packages/launchers/{nbjavac-cleanup => userdir-cleanup} | 2 ++
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/snap-packages/from-source/snapcraft-template.yaml
b/snap-packages/from-source/snapcraft-template.yaml
index 83dafc8..3381452 100644
--- a/snap-packages/from-source/snapcraft-template.yaml
+++ b/snap-packages/from-source/snapcraft-template.yaml
@@ -73,6 +73,6 @@ parts:
apps:
netbeans:
command-chain:
- - launchers/nbjavac-cleanup
+ - launchers/userdir-cleanup
command: netbeans/bin/netbeans
diff --git a/snap-packages/from-zip/snapcraft-template.yaml
b/snap-packages/from-zip/snapcraft-template.yaml
index b595731..be75175 100644
--- a/snap-packages/from-zip/snapcraft-template.yaml
+++ b/snap-packages/from-zip/snapcraft-template.yaml
@@ -68,6 +68,6 @@ parts:
apps:
netbeans:
command-chain:
- - launchers/nbjavac-cleanup
+ - launchers/userdir-cleanup
command: netbeans/bin/netbeans
diff --git a/snap-packages/launchers/nbjavac-cleanup
b/snap-packages/launchers/userdir-cleanup
old mode 100644
new mode 100755
similarity index 58%
rename from snap-packages/launchers/nbjavac-cleanup
rename to snap-packages/launchers/userdir-cleanup
index 1bb7fef..6c30a70
--- a/snap-packages/launchers/nbjavac-cleanup
+++ b/snap-packages/launchers/userdir-cleanup
@@ -4,5 +4,7 @@
find ${SNAP_USER_DATA} -name '*nbjavac.*' -delete || true
find ${SNAP_USER_DATA} -name '*nbjavac-*' -delete || true
+# Remove NetBeans Gradle Tooling if that was patched between releases.
+find ${SNAP_USER_DATA} -name netbeans-gradle-tooling.jar -delete || true
exec $@
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
