From 8b758765a62ae217ba6e09bb517fead1b0af7b72 Mon Sep 17 00:00:00 2001
From: q3aql <q3aql@duck.com>
Date: Thu, 2 Nov 2023 20:21:56 +0100
Subject: [PATCH] Fix wrappers for Homebrew

---
 wrapper/ks-av1-wrapper  | 11 +++++------
 wrapper/ks-av1s-wrapper | 11 +++++------
 wrapper/ks-avi-wrapper  | 11 +++++------
 wrapper/ks-mp4-wrapper  | 11 +++++------
 wrapper/ks-mp4k-wrapper | 11 +++++------
 wrapper/ks-mp4s-wrapper | 11 +++++------
 wrapper/ks-vob-wrapper  | 11 +++++------
 7 files changed, 35 insertions(+), 42 deletions(-)

diff --git a/wrapper/ks-av1-wrapper b/wrapper/ks-av1-wrapper
index a5d4254..f3474ea 100755
--- a/wrapper/ks-av1-wrapper
+++ b/wrapper/ks-av1-wrapper
@@ -2,15 +2,14 @@
 
 ###############################################################
 # ks-av1-wrapper (ks-tools) - Wrapper for ks-av1              #
-# Date: 12-03-2023                                            #
+# Date: 02-11-2023                                            #
 # Author: q3aql                                               #
 # Contact: q3aql@duck.com                                     #
 ###############################################################
 VERSION="8.5-dev"
-M_DATE="120323"
+M_DATE="021123"
 
 # Conversion parameters
-ks_mp4_to_wrap="/usr/bin/ks-av1"
 p_ffmpeg="ffmpeg -i"
 p_ffmpeg_patched="-max_muxing_queue_size 9999"
 rel_size="1280x534"
@@ -42,9 +41,9 @@ if [ ${error_ffmpeg} -ne 0 ] ; then
 fi
 
 # Check if ks-av1 is installed
-if [ -f ${ks_mp4_to_wrap} ] ; then
-  echo "ks-av1 detected" > /dev/null
-else
+wrap_test=$(ks-av1 &> /dev/null)
+error_wrap=$?
+if [ ${error_wrap} -ne 0 ] ; then
   echo ""
   echo "* ks-av1-wrapper (ks-tools) v${VERSION} (${M_DATE})"
   echo ""
diff --git a/wrapper/ks-av1s-wrapper b/wrapper/ks-av1s-wrapper
index 50c4fcc..698e432 100755
--- a/wrapper/ks-av1s-wrapper
+++ b/wrapper/ks-av1s-wrapper
@@ -2,15 +2,14 @@
 
 ###############################################################
 # ks-av1s-wrapper (ks-tools) - Wrapper for ks-av1s            #
-# Date: 12-03-2023                                            #
+# Date: 02-11-2023                                            #
 # Author: q3aql                                               #
 # Contact: q3aql@duck.com                                     #
 ###############################################################
 VERSION="8.5-dev"
-M_DATE="120323"
+M_DATE="021123"
 
 # Conversion parameters
-ks_mp4s_to_wrap="/usr/bin/ks-av1s"
 p_ffmpeg="ffmpeg -i"
 p_ffmpeg_patched="-max_muxing_queue_size 9999"
 rel_size="720x404"
@@ -42,9 +41,9 @@ if [ ${error_ffmpeg} -ne 0 ] ; then
 fi
 
 # Check if ks-av1s is installed
-if [ -f ${ks_mp4s_to_wrap} ] ; then
-  echo "ks-av1s detected" > /dev/null
-else
+wrap_test=$(ks-av1s &> /dev/null)
+error_wrap=$?
+if [ ${error_wrap} -ne 0 ] ; then
   echo ""
   echo "* ks-av1s-wrapper (ks-tools) v${VERSION} (${M_DATE})"
   echo ""
diff --git a/wrapper/ks-avi-wrapper b/wrapper/ks-avi-wrapper
index 17ea715..0f417d9 100755
--- a/wrapper/ks-avi-wrapper
+++ b/wrapper/ks-avi-wrapper
@@ -2,15 +2,14 @@
 
 ###############################################################
 # ks-avi-wrapper (ks-tools) - Wrapper for ks-avi              #
-# Date: 12-03-2023                                            #
+# Date: 02-11-2023                                            #
 # Author: q3aql                                               #
 # Contact: q3aql@duck.com                                     #
 ###############################################################
 VERSION="8.5-dev"
-M_DATE="120323"
+M_DATE="021123"
 
 # Conversion parameters
-ks_avi_to_wrap="/usr/bin/ks-avi"
 p_ffmpeg="ffmpeg -i"
 p_ffmpeg_patched="-max_muxing_queue_size 9999"
 rel_size="720x480"
@@ -42,9 +41,9 @@ if [ ${error_ffmpeg} -ne 0 ] ; then
 fi
 
 # Check if ks-avi is installed
-if [ -f ${ks_avi_to_wrap} ] ; then
-  echo "ks-avi detected" > /dev/null
-else
+wrap_test=$(ks-avi &> /dev/null)
+error_wrap=$?
+if [ ${error_wrap} -ne 0 ] ; then
   echo ""
   echo "* ks-avi-wrapper (ks-tools) v${VERSION} (${M_DATE})"
   echo ""
diff --git a/wrapper/ks-mp4-wrapper b/wrapper/ks-mp4-wrapper
index 06d5c66..bb04362 100755
--- a/wrapper/ks-mp4-wrapper
+++ b/wrapper/ks-mp4-wrapper
@@ -2,15 +2,14 @@
 
 ###############################################################
 # ks-mp4-wrapper (ks-tools) - Wrapper for ks-mp4              #
-# Date: 12-03-2023                                            #
+# Date: 02-11-2023                                            #
 # Author: q3aql                                               #
 # Contact: q3aql@duck.com                                     #
 ###############################################################
 VERSION="8.5-dev"
-M_DATE="120323"
+M_DATE="021123"
 
 # Conversion parameters
-ks_mp4_to_wrap="/usr/bin/ks-mp4"
 p_ffmpeg="ffmpeg -i"
 p_ffmpeg_patched="-max_muxing_queue_size 9999"
 rel_size="1280x534"
@@ -42,9 +41,9 @@ if [ ${error_ffmpeg} -ne 0 ] ; then
 fi
 
 # Check if ks-mp4 is installed
-if [ -f ${ks_mp4_to_wrap} ] ; then
-  echo "ks-mp4 detected" > /dev/null
-else
+wrap_test=$(ks-mp4 &> /dev/null)
+error_wrap=$?
+if [ ${error_wrap} -ne 0 ] ; then
   echo ""
   echo "* ks-mp4-wrapper (ks-tools) v${VERSION} (${M_DATE})"
   echo ""
diff --git a/wrapper/ks-mp4k-wrapper b/wrapper/ks-mp4k-wrapper
index 3a74000..e5ed16a 100755
--- a/wrapper/ks-mp4k-wrapper
+++ b/wrapper/ks-mp4k-wrapper
@@ -2,15 +2,14 @@
 
 ###############################################################
 # ks-mp4k-wrapper (ks-tools) - Wrapper for ks-mp4k            #
-# Date: 12-03-2023                                            #
+# Date: 02-11-2023                                            #
 # Author: q3aql                                               #
 # Contact: q3aql@duck.com                                     #
 ###############################################################
 VERSION="8.5-dev"
-M_DATE="120323"
+M_DATE="021123"
 
 # Conversion parameters
-ks_mp4k_to_wrap="/usr/bin/ks-mp4k"
 p_ffmpeg="ffmpeg -i"
 p_ffmpeg_patched="-max_muxing_queue_size 9999"
 rel_size="3840x2160"
@@ -42,9 +41,9 @@ if [ ${error_ffmpeg} -ne 0 ] ; then
 fi
 
 # Check if ks-mp4k is installed
-if [ -f ${ks_mp4k_to_wrap} ] ; then
-  echo "ks-mp4k detected" > /dev/null
-else
+wrap_test=$(ks-mp4k &> /dev/null)
+error_wrap=$?
+if [ ${error_wrap} -ne 0 ] ; then
   echo ""
   echo "* ks-mp4k-wrapper (ks-tools) v${VERSION} (${M_DATE})"
   echo ""
diff --git a/wrapper/ks-mp4s-wrapper b/wrapper/ks-mp4s-wrapper
index ddda1ba..35d3cd5 100755
--- a/wrapper/ks-mp4s-wrapper
+++ b/wrapper/ks-mp4s-wrapper
@@ -2,15 +2,14 @@
 
 ###############################################################
 # ks-mp4s-wrapper (ks-tools) - Wrapper for ks-mp4s            #
-# Date: 12-03-2023                                            #
+# Date: 02-11-2023                                            #
 # Author: q3aql                                               #
 # Contact: q3aql@duck.com                                     #
 ###############################################################
 VERSION="8.5-dev"
-M_DATE="120323"
+M_DATE="021123"
 
 # Conversion parameters
-ks_mp4s_to_wrap="/usr/bin/ks-mp4s"
 p_ffmpeg="ffmpeg -i"
 p_ffmpeg_patched="-max_muxing_queue_size 9999"
 rel_size="720x404"
@@ -42,9 +41,9 @@ if [ ${error_ffmpeg} -ne 0 ] ; then
 fi
 
 # Check if ks-mp4s is installed
-if [ -f ${ks_mp4s_to_wrap} ] ; then
-  echo "ks-mp4s detected" > /dev/null
-else
+wrap_test=$(ks-mp4s &> /dev/null)
+error_wrap=$?
+if [ ${error_wrap} -ne 0 ] ; then
   echo ""
   echo "* ks-mp4s-wrapper (ks-tools) v${VERSION} (${M_DATE})"
   echo ""
diff --git a/wrapper/ks-vob-wrapper b/wrapper/ks-vob-wrapper
index 2ec8198..996f3ec 100755
--- a/wrapper/ks-vob-wrapper
+++ b/wrapper/ks-vob-wrapper
@@ -2,15 +2,14 @@
 
 ###############################################################
 # ks-vob-wrapper (ks-tools) - Wrapper for ks-vob              #
-# Date: 12-03-2023                                            #
+# Date: 02-11-2023                                            #
 # Author: q3aql                                               #
 # Contact: q3aql@duck.com                                     #
 ###############################################################
 VERSION="8.5-dev"
-M_DATE="120323"
+M_DATE="021123"
 
 # Conversion parameters
-ks_vob_to_wrap="/usr/bin/ks-vob"
 p_ffmpeg="ffmpeg -i"
 p_ffmpeg_patched="-max_muxing_queue_size 9999"
 rel_size="720x480"
@@ -34,9 +33,9 @@ if [ ${error_ffmpeg} -ne 0 ] ; then
 fi
 
 # Check if ks-vob is installed
-if [ -f ${ks_vob_to_wrap} ] ; then
-  echo "ks-vob detected" > /dev/null
-else
+wrap_test=$(ks-vob &> /dev/null)
+error_wrap=$?
+if [ ${error_wrap} -ne 0 ] ; then
   echo ""
   echo "* ks-vob-wrapper (ks-tools) v${VERSION} (${M_DATE})"
   echo ""