@@ -106,11 +106,11 @@ |
||
106 | 106 | $parameters = array_merge($librarySettings['parameters'], ['file' => $file]); |
107 | 107 | $arguments = Utility::evaluateEelExpression($eelExpression, $this->eelEvaluator, $parameters); |
108 | 108 | |
109 | - $binaryPath = $useGlobalBinary === true ? $this->settings['globalBinaryPath'] . $library : $this->packageManager->getPackage('MOC.ImageOptimizer')->getResourcesPath() . $binaryRootPath . $binaryPath; |
|
110 | - $cmd = escapeshellcmd($binaryPath) . ' ' . $arguments; |
|
109 | + $binaryPath = $useGlobalBinary === true ? $this->settings['globalBinaryPath'].$library : $this->packageManager->getPackage('MOC.ImageOptimizer')->getResourcesPath().$binaryRootPath.$binaryPath; |
|
110 | + $cmd = escapeshellcmd($binaryPath).' '.$arguments; |
|
111 | 111 | $output = []; |
112 | 112 | exec($cmd, $output, $result); |
113 | 113 | $failed = (int)$result !== 0; |
114 | - $this->systemLogger->log($cmd . ' (' . ($failed ? 'Error: ' . $result : 'OK') . ')', $failed ? LOG_ERR : LOG_INFO, $output); |
|
114 | + $this->systemLogger->log($cmd.' ('.($failed ? 'Error: '.$result : 'OK').')', $failed ? LOG_ERR : LOG_INFO, $output); |
|
115 | 115 | } |
116 | 116 | } |