🔧 Sprinkle some ES6 across the file

This commit is contained in:
Felix Rieseberg 2017-12-01 17:18:57 -08:00
parent c5abe96b39
commit 9646f0c99a

View file

@ -8,19 +8,15 @@ const appFolder = path.dirname(process.execPath)
// i.e. my-app/Update.exe // i.e. my-app/Update.exe
const updateExe = path.resolve(appFolder, '..', 'Update.exe') const updateExe = path.resolve(appFolder, '..', 'Update.exe')
const exeName = path.basename(process.execPath) const exeName = path.basename(process.execPath)
var spawnedArgs = [] let spawnedArgs = []
var spawnedProcess let spawnedProcess
var isSameArgs = function (args) { const isSameArgs = (args) => args.length === spawnedArgs.length && args.every((e, i) => e === spawnedArgs[i])
return (args.length === spawnedArgs.length) && args.every(function (e, i) {
return e === spawnedArgs[i]
})
}
// Spawn a command and invoke the callback when it completes with an error // Spawn a command and invoke the callback when it completes with an error
// and the output from standard out. // and the output from standard out.
var spawnUpdate = function (args, detached, callback) { let spawnUpdate = function (args, detached, callback) {
var error, errorEmitted, stderr, stdout let error, errorEmitted, stderr, stdout
try { try {
// Ensure we don't spawn multiple squirrel processes // Ensure we don't spawn multiple squirrel processes
@ -33,7 +29,6 @@ var spawnUpdate = function (args, detached, callback) {
return callback(`AutoUpdater process with arguments ${args} is already running`) return callback(`AutoUpdater process with arguments ${args} is already running`)
} else if (!spawnedProcess) { } else if (!spawnedProcess) {
spawnedProcess = spawn(updateExe, args, { spawnedProcess = spawn(updateExe, args, {
detached: detached
detached: detached, detached: detached,
windowsHide: true windowsHide: true
}) })
@ -50,17 +45,16 @@ var spawnUpdate = function (args, detached, callback) {
} }
stdout = '' stdout = ''
stderr = '' stderr = ''
spawnedProcess.stdout.on('data', function (data) {
stdout += data spawnedProcess.stdout.on('data', (data) => { stdout += data })
}) spawnedProcess.stderr.on('data', (data) => { stderr += data })
spawnedProcess.stderr.on('data', function (data) {
stderr += data
})
errorEmitted = false errorEmitted = false
spawnedProcess.on('error', function (error) { spawnedProcess.on('error', (error) => {
errorEmitted = true errorEmitted = true
callback(error) callback(error)
}) })
return spawnedProcess.on('exit', function (code, signal) { return spawnedProcess.on('exit', function (code, signal) {
spawnedProcess = undefined spawnedProcess = undefined
spawnedArgs = [] spawnedArgs = []