LBRYCommunity/sudo-prompt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove dependency on locale language when detecting sudo error

Browse source
This commit is contained in:
Joran Dirk Greef 2016-01-01 15:51:58 +02:00
parent 210a928248
commit d08ec680f3
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
index.js
View file

@ -17,7 +17,7 @@ function attempt(attempts, command, options, end) {
// display an error message and exit. // display an error message and exit.
var childProcess = Node.child.exec('/usr/bin/sudo -n ' + command, var childProcess = Node.child.exec('/usr/bin/sudo -n ' + command,
function(error, stdout, stderr) { function(error, stdout, stderr) {
if (/sudo: a password is required/i.test(stderr)) { if (/sudo: /i.test(stderr)) {
if (attempts > 0) return end(new Error('User did not grant permission.')); if (attempts > 0) return end(new Error('User did not grant permission.'));
if (Node.process.platform === 'linux') { if (Node.process.platform === 'linux') {
// Linux will probably use TTY tickets for sudo timestamps. // Linux will probably use TTY tickets for sudo timestamps.
@ -32,8 +32,6 @@ function attempt(attempts, command, options, end) {
attempt(++attempts, command, options, end); // Cannot use ++ suffix here. attempt(++attempts, command, options, end); // Cannot use ++ suffix here.
} }
); );
} else if (!error && /^sudo:/i.test(stderr)) {
end(new Error('Unexpected stderr from sudo command without corresponding error: ' + stderr));
} else { } else {
end(error, stdout, stderr); end(error, stdout, stderr);
} }