Merge branch 'master' into josh/cloudflared-output

cloudflare · Jul 14, 2020 · 5dac4e2 · 5dac4e2
2 parents 127efa7 + 602b899
commit 5dac4e2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main.rs b/src/main.rs
@@ -829,7 +829,7 @@ fn run() -> Result<(), failure::Error> {
                 .unwrap_or(commands::DEFAULT_CONFIG_PATH),
         );
         let manifest = settings::toml::Manifest::new(config_path)?;
-        let env = matches.value_of("env");
+        let env = subcommand_matches.unwrap().value_of("env");
 
         let env_zone_id = if let Some(environment) = manifest.get_environment(env)? {
             environment.zone_id.as_ref()