Skip to content

Commit 246217f

Browse files
committed
add git-confined contents
1 parent 490d1c5 commit 246217f

File tree

2 files changed

+30
-8
lines changed

2 files changed

+30
-8
lines changed

snapcraft.yaml.template

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,23 @@ apps:
3030
extensions: [gnome]
3131
desktop: eclipse.desktop
3232
plugs:
33-
- personal-git-global
33+
- personal-gitconfig
34+
- personal-sshid
35+
- git-plug
3436
- personal-maven-cache
3537
- personal-eclipse-config
3638
- sources-dir
3739
- network
3840

3941
plugs:
40-
personal-git-global:
42+
personal-gitconfig:
4143
interface: personal-files
4244
read:
4345
- $HOME/.gitconfig
46+
personal-sshid:
47+
interface: personal-files
48+
read:
49+
- $HOME/.ssh
4450
personal-maven-cache:
4551
interface: personal-files
4652
write:
@@ -50,11 +56,16 @@ plugs:
5056
write:
5157
- $HOME/.eclipse
5258
- $HOME/.swt
53-
- $HOME/eclipse-workspace
59+
# ln -s ~/snap/eclipse-pde/current/workspace/ ~/eclipse-workspace/
5460
sources-dir:
5561
interface: personal-files
5662
write:
5763
- $HOME/projs
64+
git-plug:
65+
interface: content
66+
content: git-cli
67+
target: $SNAP/git-snap
68+
default-provider: git-confined
5869

5970
parts:
6071
eclipse:
@@ -80,5 +91,11 @@ parts:
8091

8192
# https://bugzilla.mozilla.org/show_bug.cgi?id=1710326
8293
layout:
83-
/usr/shar/libdrm:
94+
/usr/share/libdrm:
8495
bind: $SNAP/gnome-platform/usr/share/libdrm
96+
$SNAP/usr/bin:
97+
bind: $SNAP/git-snap/bin
98+
/usr/libexec/git-core:
99+
symlink: $SNAP/git-snap/git-core
100+
/usr/share/git-core/templates:
101+
symlink: $SNAP/git-snap/templates

try-build.sh

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
11
#!/bin/bash
22
set -e
33

4-
ECLIPSE_PACKAGE=$1
4+
if [ -n $1 ]; then
5+
ECLIPSE_PACKAGE=$1
6+
fi
7+
58
export ECLIPSE_PACKAGE=${ECLIPSE_PACKAGE:='eclipse-java'}
69

7-
./set-eclipse-package.sh
10+
. ./set-eclipse-package.sh
811

912
# snapcraft clean
1013
# sudo less /var/snap/lxd/common/lxd/logs/lxd.log
1114
snapcraft try --debug
1215

1316
sudo snap try prime # --devmode
1417

15-
sudo snap connect $ECLIPSE_PACKAGE:personal-git-global
18+
sudo snap connect $ECLIPSE_PACKAGE:personal-gitconfig
19+
sudo snap connect $ECLIPSE_PACKAGE:personal-sshid
1620
sudo snap connect $ECLIPSE_PACKAGE:personal-maven-cache
1721
sudo snap connect $ECLIPSE_PACKAGE:personal-eclipse-config
1822
sudo snap connect $ECLIPSE_PACKAGE:sources-dir
23+
sudo snap connect $ECLIPSE_PACKAGE:git-plug git-confined
1924

20-
snap run $ECLIPSE_PACKAGE
25+
# snap run $ECLIPSE_PACKAGE

0 commit comments

Comments
 (0)