fix merge conflicts

3 files changed, 5 insertions, 5 deletions

diff --git a/lib/private/preview/movies.php b/lib/private/preview/movies.php
index 71cd3bae057..7e0ff51ad2e 100644
--- a/lib/private/preview/movies.php
+++ b/lib/private/preview/movies.php
@@ -9,7 +9,7 @@
 namespace OC\Preview;
 
 function findBinaryPath($program) {
-	exec('which ' . escapeshellarg($program) . ' 2> /dev/null', $output, $returnCode);
+	exec('command -v ' . escapeshellarg($program) . ' 2> /dev/null', $output, $returnCode);
 	if ($returnCode === 0 && count($output) > 0) {
 		return escapeshellcmd($output[0]);
 	}
diff --git a/lib/private/preview/office-cl.php b/lib/private/preview/office-cl.php
index b11fed13ba1..6e4d4321eb7 100644
--- a/lib/private/preview/office-cl.php
+++ b/lib/private/preview/office-cl.php
@@ -64,12 +64,12 @@ if (!\OC_Util::runningOnWindows()) {
 				$cmd = \OC_Config::getValue('preview_libreoffice_path', null);
 			}
 
-			$whichLibreOffice = shell_exec('which libreoffice');
+			$whichLibreOffice = shell_exec('command -v libreoffice');
 			if($cmd === '' && !empty($whichLibreOffice)) {
 				$cmd = 'libreoffice';
 			}
 
-			$whichOpenOffice = shell_exec('which openoffice');
+			$whichOpenOffice = shell_exec('command -v openoffice');
 			if($cmd === '' && !empty($whichOpenOffice)) {
 				$cmd = 'openoffice';
 			}
diff --git a/lib/private/preview/office.php b/lib/private/preview/office.php
index 269e1dad74e..882c4426e6d 100644
--- a/lib/private/preview/office.php
+++ b/lib/private/preview/office.php
@@ -15,9 +15,9 @@ if (extension_loaded('imagick')) {
 
 		// LibreOffice preview is currently not supported on Windows
 		if (!\OC_Util::runningOnWindows()) {
-			$whichLibreOffice = ($isShellExecEnabled ? shell_exec('which libreoffice') : '');
+			$whichLibreOffice = ($isShellExecEnabled ? shell_exec('command -v libreoffice') : '');
 			$isLibreOfficeAvailable = !empty($whichLibreOffice);
-			$whichOpenOffice = ($isShellExecEnabled ? shell_exec('which libreoffice') : '');
+			$whichOpenOffice = ($isShellExecEnabled ? shell_exec('command -v libreoffice') : '');
 			$isOpenOfficeAvailable = !empty($whichOpenOffice);
 			//let's see if there is libreoffice or openoffice on this machine
 			if($isShellExecEnabled && ($isLibreOfficeAvailable || $isOpenOfficeAvailable || is_string(\OC_Config::getValue('preview_libreoffice_path', null)))) {