@@ -113,12 +113,12 @@ |
||
113 | 113 | $parameters = array_merge($librarySettings['parameters'], ['file' => $file]); |
114 | 114 | $arguments = Utility::evaluateEelExpression($eelExpression, $this->eelEvaluator, $parameters); |
115 | 115 | |
116 | - $binaryPath = $useGlobalBinary === true ? $this->settings['globalBinaryPath'] . $library : $this->packageManager->getPackage('MOC.ImageOptimizer')->getResourcesPath() . $binaryRootPath . $binaryPath; |
|
117 | - $cmd = escapeshellcmd($binaryPath) . ' ' . $arguments; |
|
116 | + $binaryPath = $useGlobalBinary === true ? $this->settings['globalBinaryPath'].$library : $this->packageManager->getPackage('MOC.ImageOptimizer')->getResourcesPath().$binaryRootPath.$binaryPath; |
|
117 | + $cmd = escapeshellcmd($binaryPath).' '.$arguments; |
|
118 | 118 | $output = []; |
119 | 119 | exec($cmd, $output, $result); |
120 | 120 | $failed = (int)$result !== 0; |
121 | 121 | |
122 | - $this->systemLogger->log($failed ? LogLevel::ERROR : LogLevel::INFO, $cmd . ' (' . ($failed ? 'Error: ' . $result : 'OK') . ')', array_merge(LogEnvironment::fromMethodName(__METHOD__), $output)); |
|
122 | + $this->systemLogger->log($failed ? LogLevel::ERROR : LogLevel::INFO, $cmd.' ('.($failed ? 'Error: '.$result : 'OK').')', array_merge(LogEnvironment::fromMethodName(__METHOD__), $output)); |
|
123 | 123 | } |
124 | 124 | } |