You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by lk...@apache.org on 2021/03/20 02:56:22 UTC

[netbeans] branch master updated: Fix userdir and cachedir location for netbeans-dev Snap

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.git


The following commit(s) were added to refs/heads/master by this push:
     new d81e530  Fix userdir and cachedir location for netbeans-dev Snap
d81e530 is described below

commit d81e53090fbde10d90b8e813691168921a1fd755
Author: Laszlo Kishalmi <la...@gmail.com>
AuthorDate: Fri Mar 19 19:55:51 2021 -0700

    Fix userdir and cachedir location for netbeans-dev Snap
---
 nbbuild/packaging/netbeans-dev_snap/snap/snapcraft.yaml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/nbbuild/packaging/netbeans-dev_snap/snap/snapcraft.yaml b/nbbuild/packaging/netbeans-dev_snap/snap/snapcraft.yaml
index 599d554..51aad31 100644
--- a/nbbuild/packaging/netbeans-dev_snap/snap/snapcraft.yaml
+++ b/nbbuild/packaging/netbeans-dev_snap/snap/snapcraft.yaml
@@ -63,9 +63,12 @@ parts:
         ant -quiet -Djavac.compilerargs=-nowarn -Dbuild.compiler.deprecation=false -Dbuildnumber=$(date +%Y%m%d) -Dmetabuild.jsonurl=https://raw.githubusercontent.com/apache/netbeans-jenkins-lib/master/meta/netbeansrelease.json
         mv nbbuild/netbeans $SNAPCRAFT_PART_INSTALL/netbeans
         # Make the default cache and data directory relative to Snap user directory
-        sed -i 's/${HOME}\/.netbeans\/dev/${SNAP_USER_DATA}\/data/' $SNAPCRAFT_PART_INSTALL/netbeans/bin/netbeans
-        sed -i 's/${HOME}\/.cache\/netbeans\/dev/${SNAP_USER_DATA}\/cache/' $SNAPCRAFT_PART_INSTALL/netbeans/bin/netbeans
+        sed -i 's/${HOME}\/.netbeans/${SNAP_USER_DATA}\/data/' $SNAPCRAFT_PART_INSTALL/netbeans/bin/netbeans
+        sed -i 's/${HOME}\/.cache\/netbeans/${SNAP_USER_DATA}\/cache/' $SNAPCRAFT_PART_INSTALL/netbeans/bin/netbeans
+        sed -i 's/"${DEFAULT_USERDIR_ROOT}\/.*"/"${DEFAULT_USERDIR_ROOT}"/g' $SNAPCRAFT_PART_INSTALL/netbeans/etc/netbeans.conf
+        sed -i 's/"${DEFAULT_CACHEDIR_ROOT}\/.*"/"${DEFAULT_CACHEDIR_ROOT}"/g' $SNAPCRAFT_PART_INSTALL/netbeans/etc/netbeans.conf        
         sed -i 's/-J-Dapple.laf.useScreenMenuBar=true/-J-Dplugin.manager.install.global=false/' $SNAPCRAFT_PART_INSTALL/netbeans/etc/netbeans.conf
+        chmod a+r $SNAPCRAFT_PART_INSTALL/netbeans/etc/netbeans.conf
     stage:
         - $netbeans
 

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists