diff options
| author | Marco Trevisan <mail@3v1n0.net> | 2017-05-02 22:47:19 +0300 |
|---|---|---|
| committer | Daniel Hansson <daniel@techandme.se> | 2017-05-02 22:47:19 +0300 |
| commit | d5c8424b4655c72e16929739c7f7268163480a16 (patch) | |
| tree | d14818dc698448f4a2cc7561a28c16ac8dce43fc | |
| parent | 12d9fd11f024316efda89831eb27a4098f4e8f54 (diff) | |
Use snapcraft-preload to redirect requests to the proper target (#115)
| -rw-r--r-- | linux/snap/snapcraft.yaml | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/linux/snap/snapcraft.yaml b/linux/snap/snapcraft.yaml index 3ddef3d..8b91854 100644 --- a/linux/snap/snapcraft.yaml +++ b/linux/snap/snapcraft.yaml @@ -25,16 +25,13 @@ parts: configflags: - -DCMAKE_BUILD_TYPE=Release - -DOEM_THEME_DIR=$SNAPCRAFT_PART_INSTALL/../src/nextcloudtheme - - # XXX: This is an hack to have a kind of bind-mount with absolute prefix. - - -DCMAKE_INSTALL_PREFIX=/snap/$SNAPCRAFT_PROJECT_NAME/current/usr - - -DCMAKE_INSTALL_LIBDIR=/snap/$SNAPCRAFT_PROJECT_NAME/current/usr/lib - - -DSYSCONF_INSTALL_DIR=/snap/$SNAPCRAFT_PROJECT_NAME/current/etc - organize: - snap/nextcloud-client/current: . + - -DCMAKE_INSTALL_PREFIX=/usr + - -DCMAKE_INSTALL_LIBDIR=/usr/lib + - -DSYSCONF_INSTALL_DIR=/etc after: - desktop-qt5 + - snapcraft-preload xdg-open: source: https://github.com/ubuntu-core/snapd-xdg-open.git @@ -49,9 +46,10 @@ apps: nextcloud-client: aliases: - nextcloud - command: | - env LD_LIBRARY_PATH=$SNAP/usr/lib/nextcloud:$LD_LIBRARY_PATH - desktop-launch nextcloud + + command: snapcraft-preload nextcloud + environment: + LD_LIBRARY_PATH: $SNAP/usr/lib/nextcloud:$LD_LIBRARY_PATH desktop: usr/share/applications/nextcloud.desktop plugs: - unity7 @@ -63,9 +61,9 @@ apps: cmd: aliases: - nextcloudcmd - command: | - env LD_LIBRARY_PATH=$SNAP/usr/lib/nextcloud:$LD_LIBRARY_PATH - desktop-launch nextcloudcmd + command: snapcraft-preload nextcloudcmd + environment: + LD_LIBRARY_PATH: $SNAP/usr/lib/nextcloud:$LD_LIBRARY_PATH plugs: - unity7 - home |