Merge "Centralise configuration of Shellbox /bin/sh location"

This commit is contained in:
jenkins-bot 2024-01-19 01:32:33 +00:00 committed by Gerrit Code Review
commit a9945906c7
2 changed files with 2 additions and 5 deletions

View file

@ -32,9 +32,6 @@
},
"PdfInfo": {
"value": "/usr/bin/pdfinfo"
},
"PdfHandlerShell": {
"value": "/bin/sh"
}
},
"MessagesDirs": {

View file

@ -104,7 +104,7 @@ class PdfImage {
* @return array
*/
public function retrieveMetaData(): array {
global $wgPdfInfo, $wgPdftoText, $wgPdfHandlerShell;
global $wgPdfInfo, $wgPdftoText, $wgShellboxShell;
$command = MediaWikiServices::getInstance()->getShellCommandFactory()
->createBoxed( 'pdfhandler' )
@ -113,7 +113,7 @@ class PdfImage {
->routeName( 'pdfhandler-metadata' );
$result = $command
->params( $wgPdfHandlerShell, 'scripts/retrieveMetaData.sh' )
->params( $wgShellboxShell, 'scripts/retrieveMetaData.sh' )
->inputFileFromFile(
'scripts/retrieveMetaData.sh',
__DIR__ . '/../scripts/retrieveMetaData.sh' )