From f37c28c1ee50948cc0452e3ad59d07e338a0dfac Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Fri, 25 Jun 2021 12:27:25 +0200
Subject: [PATCH] Fix

---
 .../ffprobe.patch                                 | 15 ++++++++++++++-
 scripts/install                                   |  6 +-----
 sources/app-00-add-ffprobe-path.patch             | 13 -------------
 3 files changed, 15 insertions(+), 19 deletions(-)
 rename sources/app-01-add-ffprobe-path.patch => conf/ffprobe.patch (62%)
 delete mode 100644 sources/app-00-add-ffprobe-path.patch

diff --git a/sources/app-01-add-ffprobe-path.patch b/conf/ffprobe.patch
similarity index 62%
rename from sources/app-01-add-ffprobe-path.patch
rename to conf/ffprobe.patch
index 0d1f1a5..7453bd3 100644
--- a/sources/app-01-add-ffprobe-path.patch
+++ b/conf/ffprobe.patch
@@ -13,4 +13,17 @@ index 1a96769..5842606 100644
 +               ));
                 /** @var Video */
                 $video = $ffmpeg->open(Storage::path('big/' . $photo->url));
-                if (!($tmp = tempnam(sys_get_temp_dir(), 'lychee')) ||
\ No newline at end of file
+                if (!($tmp = tempnam(sys_get_temp_dir(), 'lychee')) ||
+diff --git a/vendor/lychee-org/php-exif/lib/PHPExif/Adapter/FFprobe.php b/vendor/lychee-org/php-exif/lib/PHPExif/Adapter/FFprobe.php
+index 9ececfe..106eadd 100644
+--- a/vendor/lychee-org/php-exif/lib/PHPExif/Adapter/FFprobe.php
++++ b/vendor/lychee-org/php-exif/lib/PHPExif/Adapter/FFprobe.php
+@@ -33,7 +33,7 @@ class FFprobe extends AdapterAbstract
+      *
+      * @var string
+      */
+-    protected $toolPath;
++    protected $toolPath = '/usr/bin/ffprobe';
+
+     /**
+      * @var string
\ No newline at end of file
diff --git a/scripts/install b/scripts/install
index 652deab..5b68ee3 100755
--- a/scripts/install
+++ b/scripts/install
@@ -146,11 +146,7 @@ ynh_add_config --template="../conf/user.css.example" --destination="$final_path/
 # PATCHS
 #=================================================
 
-(cd $final_path/vendor/lychee-org/php-exif/lib/PHPExif/Adapter/FFprobe.php/
-patch -p1 < ../sources/app-00-add-ffprobe-path.patch)
-
-(cd $final_path/app/Actions/Photo/Extensions/VideoEditing.php/
-patch -p1 < ../sources/app-01-add-ffprobe-path.patch)
+git apply ../conf/ffprobe.patch
 
 #=================================================
 # SETUP SSOWAT
diff --git a/sources/app-00-add-ffprobe-path.patch b/sources/app-00-add-ffprobe-path.patch
deleted file mode 100644
index 58364e8..0000000
--- a/sources/app-00-add-ffprobe-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/vendor/lychee-org/php-exif/lib/PHPExif/Adapter/FFprobe.php b/vendor/lychee-org/php-exif/lib/PHPExif/Adapter/FFprobe.php
-index 9ececfe..106eadd 100644
---- a/vendor/lychee-org/php-exif/lib/PHPExif/Adapter/FFprobe.php
-+++ b/vendor/lychee-org/php-exif/lib/PHPExif/Adapter/FFprobe.php
-@@ -33,7 +33,7 @@ class FFprobe extends AdapterAbstract
-      *
-      * @var string
-      */
--    protected $toolPath;
-+    protected $toolPath = '/usr/bin/ffprobe';
-
-     /**
-      * @var string
\ No newline at end of file