From b4d835f6836f7dff1577064249afa69cd701e7ac Mon Sep 17 00:00:00 2001 From: William Cheng Date: Thu, 4 Oct 2018 23:54:10 +0800 Subject: [PATCH] rename perl environment variable (#1172) --- .../codegen/languages/PerlClientCodegen.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java index 5a2397684fcf..f2c52611a26f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java @@ -133,8 +133,8 @@ public PerlClientCodegen() { public void processOpts() { super.processOpts(); - if (StringUtils.isEmpty(System.getenv("PERLTIDY_PATH"))) { - LOGGER.info("Environment variable PERLTIDY_PATH not defined so the Perl code may not be properly formatted. To define it, try 'export PERLTIDY_PATH=/usr/local/bin/perltidy' (Linux/Mac)"); + if (StringUtils.isEmpty(System.getenv("PERL_POST_PROCESS_FILE"))) { + LOGGER.info("Environment variable PERL_POST_PROCESS_FILE not defined so the Perl code may not be properly formatted. To define it, try 'export PERL_POST_PROCESS_FILE=/usr/local/bin/perltidy -b -bext=\"/\"' (Linux/Mac)"); } if (additionalProperties.containsKey(MODULE_VERSION)) { @@ -571,9 +571,9 @@ public void postProcessFile(File file, String fileType) { return; } - String perlTidyPath = System.getenv("PERLTIDY_PATH"); + String perlTidyPath = System.getenv("PERL_POST_PROCESS_FILE"); if (StringUtils.isEmpty(perlTidyPath)) { - return; // skip if PERLTIDY_PATH env variable is not defined + return; // skip if PERL_POST_PROCESS_FILE env variable is not defined } // only process files with .t, .pm extension @@ -583,11 +583,12 @@ public void postProcessFile(File file, String fileType) { String command = perlTidyPath + " -b -bext='/' " + file.toString(); try { Process p = Runtime.getRuntime().exec(command); - p.waitFor(); - if (p.exitValue() != 0) { - LOGGER.error("Error running the command ({}). Exit code: {}", command, p.exitValue()); + int exitValue = p.waitFor(); + if (exitValue != 0) { + LOGGER.error("Error running the command ({}). Exit code: {}", command, exitValue); + } else { + LOGGER.info("Successfully executed: " + command); } - LOGGER.info("Successfully executed: " + command); } catch (Exception e) { LOGGER.error("Error running the command ({}). Exception: {}", command, e.getMessage()); }