parent
3ee8e07bd3
commit
6d26fadfe6
|
@ -40,7 +40,7 @@ class BinExt
|
||||||
$cmd = implode(' ', array_merge(self::getExiftool(), ['-ver']));
|
$cmd = implode(' ', array_merge(self::getExiftool(), ['-ver']));
|
||||||
$out = shell_exec($cmd);
|
$out = shell_exec($cmd);
|
||||||
if (!$out) {
|
if (!$out) {
|
||||||
throw new \Exception('failed to run exiftool');
|
throw new \Exception("failed to run exiftool: {$cmd}");
|
||||||
}
|
}
|
||||||
|
|
||||||
$version = trim($out);
|
$version = trim($out);
|
||||||
|
@ -64,7 +64,7 @@ class BinExt
|
||||||
public static function getExiftool(): array
|
public static function getExiftool(): array
|
||||||
{
|
{
|
||||||
if (Util::getSystemConfig('memories.exiftool_no_local')) {
|
if (Util::getSystemConfig('memories.exiftool_no_local')) {
|
||||||
return ['perl', __DIR__.'/../exiftool-bin/exiftool/exiftool'];
|
return ['perl', realpath(__DIR__.'/../exiftool-bin/exiftool/exiftool')];
|
||||||
}
|
}
|
||||||
|
|
||||||
return [self::getExiftoolPBin()];
|
return [self::getExiftoolPBin()];
|
||||||
|
|
Loading…
Reference in New Issue