From 7906fce2f4f96bd0ae495117388c009b3bd0e4fc Mon Sep 17 00:00:00 2001 From: darealshinji Date: Sun, 20 Nov 2016 11:05:09 +0100 Subject: [PATCH 1/2] Update Nightingale.yml --- recipes/meta/Nightingale.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/recipes/meta/Nightingale.yml b/recipes/meta/Nightingale.yml index e504065d..c5e7ccb0 100644 --- a/recipes/meta/Nightingale.yml +++ b/recipes/meta/Nightingale.yml @@ -1,8 +1,25 @@ app: Nightingale ingredients: + packages: + - nightingale + - libcurl3-gnutls + - libhogweed2 dist: trusty sources: - deb http://archive.ubuntu.com/ubuntu/ trusty main universe ppas: - djcj/nightingale + +script: + - sudo apt-get install -y libglib2.0-bin + - rm -rf usr/lib/x86_64-linux-gnu/x264-10bit/ usr/bin/nightingale + - cat <<\EOF> usr/bin/nightingale + - #!/bin/sh + - usr="`pwd`" + - export LD_LIBRARY_PATH="$usr/lib/nightingale/xulrunner:$LD_LIBRARY_PATH" + - export GST_PLUGIN_PATH="$usr/lib/x86_64-linux-gnu/gstreamer-0.10:$usr/lib/nightingale/gst-plugins" + - export GST_PLUGIN_SCANNER="$usr/lib/x86_64-linux-gnu/gstreamer0.10/gstreamer-0.10/gst-plugin-scanner" + - "$usr/lib/nightingale/nightingale-bin" $* + - EOF + - chmod a+x usr/bin/nightingale From f54dd8e1431ded245962be0cb3c550a1b6144cf3 Mon Sep 17 00:00:00 2001 From: darealshinji Date: Sun, 20 Nov 2016 11:39:25 +0100 Subject: [PATCH 2/2] Nightingale.yml: use $(...) instead of backticks --- recipes/meta/Nightingale.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/meta/Nightingale.yml b/recipes/meta/Nightingale.yml index c5e7ccb0..ce77f8b2 100644 --- a/recipes/meta/Nightingale.yml +++ b/recipes/meta/Nightingale.yml @@ -16,7 +16,7 @@ script: - rm -rf usr/lib/x86_64-linux-gnu/x264-10bit/ usr/bin/nightingale - cat <<\EOF> usr/bin/nightingale - #!/bin/sh - - usr="`pwd`" + - usr="$(pwd)" - export LD_LIBRARY_PATH="$usr/lib/nightingale/xulrunner:$LD_LIBRARY_PATH" - export GST_PLUGIN_PATH="$usr/lib/x86_64-linux-gnu/gstreamer-0.10:$usr/lib/nightingale/gst-plugins" - export GST_PLUGIN_SCANNER="$usr/lib/x86_64-linux-gnu/gstreamer0.10/gstreamer-0.10/gst-plugin-scanner"