diff options
author | Ryan Dahl <ry@tinyclouds.org> | 2021-05-10 07:11:34 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-10 07:11:34 -0400 |
commit | 18c75f0e4265d4942a93dd67f7cbd34e79281be8 (patch) | |
tree | c8d7fb568718f0a291e2d0c57047940ff51d2ae5 | |
parent | dfe528198d363ebc883da84dc816bce112ecd24b (diff) |
Switch grant/deny prompt to yes/no (#10547)
-rw-r--r-- | cli/tests/integration_tests.rs | 6 | ||||
-rw-r--r-- | runtime/permissions.rs | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/cli/tests/integration_tests.rs b/cli/tests/integration_tests.rs index 5a535e4d8..cfb450678 100644 --- a/cli/tests/integration_tests.rs +++ b/cli/tests/integration_tests.rs @@ -2902,7 +2902,7 @@ console.log("finish"); fn _061_permissions_request() { let args = "run 061_permissions_request.ts"; let output = "061_permissions_request.ts.out"; - let input = b"g\nd\n"; + let input = b"y\nn\n"; util::test_pty(args, output, input); } @@ -2912,7 +2912,7 @@ console.log("finish"); fn _062_permissions_request_global() { let args = "run 062_permissions_request_global.ts"; let output = "062_permissions_request_global.ts.out"; - let input = b"g\n"; + let input = b"y\n"; util::test_pty(args, output, input); } @@ -3077,7 +3077,7 @@ console.log("finish"); fn _090_run_permissions_request() { let args = "run 090_run_permissions_request.ts"; let output = "090_run_permissions_request.ts.out"; - let input = b"g\nd\n"; + let input = b"y\nn\n"; util::test_pty(args, output, input); } diff --git a/runtime/permissions.rs b/runtime/permissions.rs index 3bdfd16bb..d98bcc71a 100644 --- a/runtime/permissions.rs +++ b/runtime/permissions.rs @@ -1054,9 +1054,9 @@ fn permission_prompt(message: &str) -> bool { if !atty::is(atty::Stream::Stdin) || !atty::is(atty::Stream::Stderr) { return false; }; - let opts = "[g/d (g = grant, d = deny)] "; + let opts = "[y/n (y = yes allow, n = no deny)] "; let msg = format!( - "{} ️Deno requests {}. Grant? {}", + "{} ️Deno requests {}. Allow? {}", PERMISSION_EMOJI, message, opts ); // print to stderr so that if deno is > to a file this is still displayed. @@ -1073,8 +1073,8 @@ fn permission_prompt(message: &str) -> bool { Some(v) => v, }; match ch.to_ascii_lowercase() { - 'g' => return true, - 'd' => return false, + 'y' => return true, + 'n' => return false, _ => { // If we don't get a recognized option try again. let msg_again = format!("Unrecognized option '{}' {}", ch, opts); |