From e1fb9449a4236e69bf13d14bf428bbd4045b780c Mon Sep 17 00:00:00 2001
From: Daniel Llewellyn <diddledan@ubuntu.com>
Date: Mon, 1 Feb 2021 02:19:51 +0000
Subject: [PATCH] Re-add makemkv-launch script

* Set ccextractor path if unset. Fixes #11
* Set default save path to `$HOME/movies`. Fixes #10

Signed-off-by: Daniel Llewellyn <diddledan@ubuntu.com>
---
 scripts/makemkv-launch | 32 ++++++++++++++++++++++++++++++++
 snap/snapcraft.yaml    |  4 +++-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100755 scripts/makemkv-launch

diff --git a/scripts/makemkv-launch b/scripts/makemkv-launch
new file mode 100755
index 0000000..fcfd1bc
--- /dev/null
+++ b/scripts/makemkv-launch
@@ -0,0 +1,32 @@
+#!/bin/sh -e
+if [ ! -f $SNAP_USER_DATA/.MakeMKV/settings.conf ]; then
+    mkdir -p $SNAP_USER_DATA/.MakeMKV
+
+    cat > $SNAP_USER_DATA/.MakeMKV/settings.conf <<SEOF
+#
+# MakeMKV settings file, written by MakeMKV v1.14.5 linux(x64-release)
+#
+
+app_DestinationDir = "$SNAP_REAL_HOME/movies"
+app_DestinationType = "2"
+app_Java = "/snap/makemkv/current/usr/bin/java"
+app_Key = ""
+app_PreferredLanguage = ""
+app_ccextractor = "/snap/makemkv/current/usr/bin/ccextractor"
+dvd_MinimumTitleLength = "300"
+sdf_Stop = ""
+SEOF
+
+else
+    if grep -q 'app_DestinationDir = ""' $SNAP_USER_DATA/.MakeMKV/settings.conf; then
+        sed -i -E 's|(app_DestinationDir = )""|\1"'"$SNAP_REAL_HOME/movies"'"|' $SNAP_USER_DATA/.MakeMKV/settings.conf
+    fi
+    if grep -q 'app_Java = ""' $SNAP_USER_DATA/.MakeMKV/settings.conf; then
+        sed -i -E 's|(app_Java = )""|\1"/snap/makemkv/current/usr/bin/java"|' $SNAP_USER_DATA/.MakeMKV/settings.conf
+    fi
+    if grep -q 'app_ccextractor = ""' $SNAP_USER_DATA/.MakeMKV/settings.conf; then
+        sed -i -E 's|(app_ccextractor = )""|\1"/snap/makemkv/current/usr/bin/ccextractor"|' $SNAP_USER_DATA/.MakeMKV/settings.conf
+    fi
+fi
+
+exec $@
\ No newline at end of file
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 6be80bc..993327a 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -64,6 +64,7 @@ apps:
     command-chain:
     - bin/desktop-launch
     - bin/check-ld-cache
+    - bin/makemkv-launch
     - bin/snapcraft-preload
     desktop: usr/share/applications/makemkv.desktop
     environment:
@@ -88,6 +89,7 @@ apps:
     command: usr/bin/makemkvcon
     command-chain:
     - bin/check-ld-cache
+    - bin/makemkv-launch
     - bin/snapcraft-preload
     environment:
       FINAL_BINARY: $SNAP/usr/bin/makemkvcon.real
@@ -259,7 +261,7 @@ parts:
       snapcraftctl build
 
       JDK=$(find /usr/lib/jvm -type d -name "java-11-openjdk-*" | head -n1 | xargs basename)
-      JDKBIN=../lib/jvm/$JDK/jre/bin
+      JDKBIN=../lib/jvm/$JDK/bin
       for exec in java javaws jexec jjs; do
         ln -sf $JDKBIN/$exec $SNAPCRAFT_PART_INSTALL/usr/bin/$exec
       done