diff options
Diffstat (limited to 'cli')
| -rw-r--r-- | cli/js/main.ts | 4 | ||||
| -rw-r--r-- | cli/ops/os.rs | 8 | ||||
| -rw-r--r-- | cli/tests/028_args.ts.out | 1 |
3 files changed, 7 insertions, 6 deletions
diff --git a/cli/js/main.ts b/cli/js/main.ts index 8a0f805a8..005686230 100644 --- a/cli/js/main.ts +++ b/cli/js/main.ts @@ -25,10 +25,8 @@ function denoMain(preserveDenoNamespace = true, name?: string): void { assert(s.mainModule.length > 0); setLocation(s.mainModule); } - log("cwd", s.cwd); - - for (let i = 1; i < s.argv.length; i++) { + for (let i = 0; i < s.argv.length; i++) { args.push(s.argv[i]); } log("args", args); diff --git a/cli/ops/os.rs b/cli/ops/os.rs index e01071230..8add8759c 100644 --- a/cli/ops/os.rs +++ b/cli/ops/os.rs @@ -41,11 +41,15 @@ fn op_start( _zero_copy: Option<PinnedBuf>, ) -> Result<JsonOp, ErrBox> { let gs = &state.global_state; - + let script_args = if gs.flags.argv.len() >= 2 { + gs.flags.argv.clone().split_off(2) + } else { + vec![] + }; Ok(JsonOp::Sync(json!({ "cwd": deno_fs::normalize_path(&env::current_dir().unwrap()), "pid": std::process::id(), - "argv": gs.flags.argv, + "argv": script_args, "mainModule": gs.main_module.as_ref().map(|x| x.to_string()), "debugFlag": gs.flags.log_level.map_or(false, |l| l == log::Level::Debug), "versionFlag": gs.flags.version, diff --git a/cli/tests/028_args.ts.out b/cli/tests/028_args.ts.out index fa36f6e4c..0f1b5c59e 100644 --- a/cli/tests/028_args.ts.out +++ b/cli/tests/028_args.ts.out @@ -1,4 +1,3 @@ -028_args.ts --arg1 val1 --arg2=val2 |