mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-24 01:16:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Fixed settings.

Browse source
This commit is contained in:
SamTV12345 2024-02-21 22:22:38 +01:00
parent 419ee5b371
commit ff5a0688f3
9 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/node/utils/LibreOffice.js
View file

@ -23,14 +23,14 @@ const log4js = require('log4js');
const os = require('os');
const path = require('path');
const runCmd = require('./run_cmd');
import {soffice} from './Settings';
import {settings} from './Settings';
const logger = log4js.getLogger('LibreOffice');
const doConvertTask = async (task) => {
const tmpDir = os.tmpdir();
const p = runCmd([
soffice,
settings.soffice,
'--headless',
'--invisible',
'--nologo',

10
src/node/utils/run_cmd.ts
View file

@ -5,11 +5,11 @@ import {ChildProcess} from "node:child_process";
import {PromiseWithStd} from "../types/PromiseWithStd";
import {Readable} from "node:stream";
import {root, settings} from "./Settings";
import {root} from "./Settings";
const spawn = require('cross-spawn');
const log4js = require('log4js');
const path = require('path');
import spawn from 'cross-spawn';
import log4js from 'log4js';
import path from 'path';
const logger = log4js.getLogger('runCmd');
const logLines = (readable: undefined | Readable | null, logLineFn: (arg0: (string | undefined)) => void) => {
@ -74,7 +74,7 @@ const logLines = (readable: undefined | Readable | null, logLineFn: (arg0: (stri
* - `stderr`: Similar to `stdout` but for stderr.
* - `child`: The ChildProcess object.
*/
module.exports = exports = (args: string[], opts:RunCMDOptions = {}) => {
module.exports = exports = (args: string[], opts:any = {}) => {
logger.debug(`Executing command: ${args.join(' ')}`);
opts = {cwd: root, ...opts};