mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 23:46:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

node8: we can safely use os.tmpdir()

Browse source 
Since we are requiring node >= 8, we can safely use native functionalities.
This commit is contained in:
muxator 2019-02-15 22:30:17 +01:00 • committed by muxator
parent 09949c242a
commit 6d36bb2c53
3 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/node/handler/ExportHandler.js
View file

@ -40,13 +40,7 @@ if(settings.abiword != null)
if(settings.soffice != null) if(settings.soffice != null)
convertor = require("../utils/LibreOffice"); convertor = require("../utils/LibreOffice");
var tempDirectory = "/tmp"; const tempDirectory = os.tmpdir();
//tempDirectory changes if the operating system is windows
if(os.type().indexOf("Windows") > -1)
{
tempDirectory = process.env.TEMP;
}
/** /**
* do a requested export * do a requested export

3
src/node/handler/ImportHandler.js
View file

@ -47,8 +47,7 @@ if(settings.soffice != null) {
exportExtension = "html"; exportExtension = "html";
} }
//for node 0.6 compatibily, os.tmpDir() only works from 0.8 const tmpDirectory = os.tmpdir();
var tmpDirectory = process.env.TEMP || process.env.TMPDIR || process.env.TMP || '/tmp';
/** /**
* do a requested import * do a requested import

3
tests/backend/specs/api/tidy.js
View file

@ -23,7 +23,8 @@ describe('tidyHtml', function() {
} }
// Try to tidy up a bad HTML file // Try to tidy up a bad HTML file
var tmpDir = process.env.TEMP || "/tmp"; const tmpDir = os.tmpdir();
var tmpFile = path.join(tmpDir, 'tmp_' + (Math.floor(Math.random() * 1000000)) + '.html') var tmpFile = path.join(tmpDir, 'tmp_' + (Math.floor(Math.random() * 1000000)) + '.html')
fs.writeFileSync(tmpFile, '<html><body><p>a paragraph</p><li>List without outer UL</li>trailing closing p</p></body></html>'); fs.writeFileSync(tmpFile, '<html><body><p>a paragraph</p><li>List without outer UL</li>trailing closing p</p></body></html>');
TidyHtml.tidy(tmpFile, function(err){ TidyHtml.tidy(tmpFile, function(err){