diff --git a/src/utils/registry.js b/src/utils/registry.js index 1abdfe5..a74c581 100644 --- a/src/utils/registry.js +++ b/src/utils/registry.js @@ -2,13 +2,14 @@ const child_process = require('child_process'); const { join } = require('path'); const sr = process.env.SystemRoot; -const regExePath = join(sr || '', sr ? 'System32' : '', 'reg.exe'); // %SystemRoot%\System32\reg.exe OR reg.exe if SR is undefined +const regExe = join(sr || '', sr ? 'System32' : '', 'reg.exe'); // %SystemRoot%\System32\reg.exe OR reg.exe if SR is undefined -const _spawn = (cmd, args, callback = (() => {})) => { + +const spawn = (args, callback = (() => {})) => { let process, stdout = ''; try { - process = child_process.spawn(cmd, args); + process = child_process.spawn(regExe, args); } catch (e) { callback(e, stdout); } @@ -17,11 +18,9 @@ const _spawn = (cmd, args, callback = (() => {})) => { process.on('error', err => callback(err, stdout)); - process.on('exit', (code, signal) => callback(code !== 0 ? new Error('Spawn returned: ' + signal ?? code) : null, stdout)); + process.on('exit', (code, signal) => callback(code !== 0 ? new Error('Spawn: ' + signal ?? code) : null, stdout)); }; -const spawn = (args, callback) => _spawn(regExePath, args, callback); - const add = (queue, callback = (() => {})) => { const args = queue.shift(); if (!args) return callback(); @@ -29,7 +28,7 @@ const add = (queue, callback = (() => {})) => { args.unshift('add'); args.push('/f'); - return spawnReg(args, () => add(queue, callback)); + return spawn(args, () => add(queue, callback)); }; module.exports = {