2 files changed, 26 insertions, 19 deletions
diff --git a/src/flags.rs b/src/flags.rs
index ceeb9e564..ed60a0280 100644
--- a/src/flags.rs
+++ b/src/flags.rs
@@ -1,10 +1,13 @@
 // Copyright 2018 the Deno authors. All rights reserved. MIT license.
 use libc::c_int;
 use libdeno;
+use log;
 use std::ffi::CStr;
 use std::ffi::CString;
 use std::mem;
+use std::process::exit;
 use std::vec::Vec;
+use version;
 
 // Creates vector of strings, Vec<String>
 #[cfg(test)]
@@ -25,6 +28,24 @@ pub struct DenoFlags {
   pub deps_flag: bool,
 }
 
+pub fn process(flags: &DenoFlags) {
+  if flags.help {
+    print_usage();
+    exit(0);
+  }
+
+  if flags.version {
+    version::print_version();
+    exit(0);
+  }
+
+  let mut log_level = log::LevelFilter::Info;
+  if flags.log_debug {
+    log_level = log::LevelFilter::Debug;
+  }
+  log::set_max_level(log_level);
+}
+
 pub fn print_usage() {
   println!(
     "Usage: deno script.ts
@@ -43,6 +64,8 @@ pub fn print_usage() {
 
 // Parses flags for deno. This does not do v8_set_flags() - call that separately.
 pub fn set_flags(args: Vec<String>) -> (DenoFlags, Vec<String>) {
+  let args = v8_set_flags(args);
+
   let mut flags = DenoFlags::default();
   let mut rest = Vec::new();
   let mut arg_iter = args.iter();
diff --git a/src/main.rs b/src/main.rs
index 764f5a0c6..8cf29dd37 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -48,25 +48,9 @@ impl log::Log for Logger {
 fn main() {
   log::set_logger(&LOGGER).unwrap();
 
-  let js_args = flags::v8_set_flags(env::args().collect());
-
-  let mut isolate = Isolate::new(js_args);
-
-  if isolate.flags.help {
-    flags::print_usage();
-    std::process::exit(0);
-  }
-
-  if isolate.flags.version {
-    version::print_version();
-    std::process::exit(0);
-  }
-
-  let mut log_level = log::LevelFilter::Info;
-  if isolate.flags.log_debug {
-    log_level = log::LevelFilter::Debug;
-  }
-  log::set_max_level(log_level);
+  let args = env::args().collect();
+  let mut isolate = Isolate::new(args);
+  flags::process(&isolate.flags);
 
   isolate
     .execute("deno_main.js", "denoMain();")