[vlc-devel] [vlc-commits] snap: provide a wrapper script to launch with needed LD_LIBRARY_PATH.

[Rémi Denis-Courmont]

Le dimanche 8 janvier 2017, 00:26:19 Konstantin Pavlov a écrit :
> vlc | branch: master | Konstantin Pavlov <thresh at videolan.org> | Sun Jan  8
> 00:39:23 2017 +0300| [6605d043c71aea2a2b20384e15dab16ea662a2df] |
> committer: Konstantin Pavlov
> 
> snap: provide a wrapper script to launch with needed LD_LIBRARY_PATH.
> 
> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6605d043c71aea2a2b2
> > 0384e15dab16ea662a2df
> ---
> 
>  extras/package/snap/snapcraft.yaml      | 8 +++++++-
>  extras/package/snap/vlc-snap-wrapper.sh | 5 +++++
>  2 files changed, 12 insertions(+), 1 deletion(-)
> 
> diff --git a/extras/package/snap/snapcraft.yaml
> b/extras/package/snap/snapcraft.yaml index 8f99e3f..c23cca1 100644
> --- a/extras/package/snap/snapcraft.yaml
> +++ b/extras/package/snap/snapcraft.yaml
> @@ -9,7 +9,7 @@ confinement: strict
> 
>  apps:
>    vlc:
> -    command: desktop-launch vlc
> +    command: bin/vlc-snap-wrapper.sh
>      plugs:
>        - unity7
>        - network
> @@ -183,3 +183,9 @@ parts:
>        - libxpm4
>        - zlib1g
>      after: [vlc] # VLC build fails if stage packages are present
> +
> +  wrapper:
> +    plugin: dump
> +    source: .
> +    organize:
> +      vlc-snap-wrapper.sh: bin/vlc-snap-wrapper.sh
> diff --git a/extras/package/snap/vlc-snap-wrapper.sh
> b/extras/package/snap/vlc-snap-wrapper.sh new file mode 100755
> index 0000000..71efd11
> --- /dev/null
> +++ b/extras/package/snap/vlc-snap-wrapper.sh
> @@ -0,0 +1,5 @@
> +#!/bin/sh
> +
> +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SNAP/lib/vlc"

Doesn't this incorrectly add $CWD to search path if the variable is initially 
unset?

> +
> +desktop-launch vlc "$@"

exec ... ?

> 
> _______________________________________________
> vlc-commits mailing list
> vlc-commits at videolan.org
> https://mailman.videolan.org/listinfo/vlc-commits

-- 
Rémi Denis-Courmont
http://www.remlab.net/