Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adjust search for LO binary on Linux to support Arch Linux #189

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+6 −4
Open

Adjust search for LO binary on Linux to support Arch Linux #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1e9d87
Update README.md
dgrelaud May 26, 2023
4c70952
fix: adjust linux binary search
jan-san Jul 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 5 additions & 3 deletions lib/converter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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') {
Expand All @@ -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
Expand Down