diff --git a/README.md b/README.md index 336c904f..f304a185 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ ### News -15th of February 2023: Carbone just launched [on Product Hunt](https://www.producthunt.com/posts/carbone)! Feel free to support us. It will help us improve the engine! +June 2023: A new Carbone website is coming with a free interactive tutorial (FR/EN) to learn Carbone language. Stay tuned 👋. Please consider using the Cloud or On-Premise [Enterprise Edition](https://carbone.io/pricing.html) if you need **professional support**. The Community Edition is one major version behind the Enterprise Edition. Feel free to contact us [on the chat](https://carbone.io) if you need further information. diff --git a/lib/converter.js b/lib/converter.js index 7178cade..4c9ad425 100644 --- a/lib/converter.js +++ b/lib/converter.js @@ -350,7 +350,7 @@ function generateOnExitCallback (factoryID, isPythonProcess, factoryUniqueName) // - The event "spawn.close" is received only if stdin, stdout and stderr are closed. So carbone hangs indefinitely :( // When killing the oospash parent process, we should close stdin, stdout and stderr and kill the child thread soffice ourself (like "pkill soffice") // - // Also, we could use SIGTERM. In that case, oosplash (parent) sends the signal to its child... but this signal is not powerful enough to + // Also, we could use SIGTERM. In that case, oosplash (parent) sends the signal to its child... but this signal is not powerful enough to // guarantee a shutdown. If LibreOffice hangs, we could wait forever. // // It is easier to only launch directly soffice.bin directly on Linux (see below) @@ -611,7 +611,7 @@ function detectLibreOffice (additionalPaths) { // overridable file names to look for in the checked paths: var _pythonName = 'python'; var _sofficeName = 'soffice'; - var _linuxDirnamePattern = /^libreoffice\d+\.\d+$/; + var _linuxDirnamePattern = /^libreoffice(\d+\.\d+)?$/; var _windowsDirnamePattern = /^LibreOffice( \d+(?:\.\d+)*?)?$/i; if (process.platform === 'darwin') { @@ -628,7 +628,9 @@ function detectLibreOffice (additionalPaths) { // The Document Foundation packages (.debs, at least) install to /opt, // into a directory named after the contained LibreOffice version. // Add any existing directories that match this to the list. - _pathsToCheck = _pathsToCheck.concat(_listProgramDirectories('/opt', _linuxDirnamePattern)); + _pathsToCheck = _pathsToCheck + .concat(_listProgramDirectories('/opt', _linuxDirnamePattern)) + .concat(_listProgramDirectories('/usr/lib', _linuxDirnamePattern));; } else if (process.platform === 'win32') { _pathsToCheck = _pathsToCheck