From 2bc4df5cef9fcd6f97960bdfb8a85b24c9f4d810 Mon Sep 17 00:00:00 2001 From: Daniel Llewellyn Date: Mon, 12 Nov 2018 17:48:28 +0000 Subject: [PATCH] remove snapcraft preload - it doesn't work --- snap/snapcraft.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 5024eed..326c1ab 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -100,7 +100,6 @@ parts: - qtwayland5 makemkv-bin: - after: [snapcraft-preload] source: http://www.makemkv.com/download/makemkv-bin-$SNAPCRAFT_PROJECT_VERSION.tar.gz plugin: make build-packages: @@ -113,20 +112,11 @@ parts: snapcraftctl build - mv $SNAPCRAFT_PART_INSTALL/usr/bin/makemkvcon $SNAPCRAFT_PART_INSTALL/usr/bin/makemkvcon.real - JDK=$(find /usr/lib/jvm -type d -name "java-8-openjdk-*" | head -n1 | xargs basename) JDKBIN=../lib/jvm/$JDK/jre/bin for exec in java javaws jexec jjs; do ln -sf $JDKBIN/$exec $SNAPCRAFT_PART_INSTALL/usr/bin/$exec done - - mkdir -p $SNAPCRAFT_PART_INSTALL/usr/bin - cat < $SNAPCRAFT_PART_INSTALL/usr/bin/makemkvcon - #!/bin/sh - exec \$SNAP/bin/snapcraft-preload \$SNAP/usr/bin/makemkvcon.real "\$@" - EOF - chmod +x $SNAPCRAFT_PART_INSTALL/usr/bin/makemkvcon stage: - -usr/lib/jvm/java-8-openjdk-amd64/jre/lib/security/cacerts stage-packages: