From 3751040fe04481797d4949bdeb141dd0a3dc06ef Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Mon, 27 Mar 2023 13:08:04 +1300 Subject: [PATCH] Use environment.get()'s second default value argument instead of using null checks --- main.d | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/main.d b/main.d index 20f5d2c..123db09 100644 --- a/main.d +++ b/main.d @@ -120,13 +120,12 @@ int main(string[] args) configPath = optConfigPath.expandTilde(); else panic(optConfigPath ~ ": invalid file path"); - } else if (configEnvVar !is null) { - if (configEnvVar.isValidPath()) - configPath = configEnvVar.expandTilde(); + } else { + configPath = environment.get(ENV_CONFIG, DEFAULT_CONFIGPATH); + if (configPath.isValidPath()) + configPath = configPath.expandTilde(); else panic(configEnvVar ~ ": invalid file path"); - } else { - configPath = DEFAULT_CONFIGPATH.expandTilde(); if (!configPath.exists()) { configPath.write( "# Default esv configuration file.