This commit address several related issues regarding the upgrader CLI:

kenneth_suter

08.15.2007 3d8214539ebc6afc6f948f60a8010d3de8c31a0d

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Launcher.java

@@ -252,16 +252,11 @@
   */
  protected int launchCli(String[] args, CliApplication cliApp) {
    System.setProperty("org.opends.quicksetup.cli", "true");

    QuickSetupCli cli = new QuickSetupCli(cliApp, args);
    int returnValue = cli.run();
    if (returnValue == QuickSetupCli.USER_DATA_ERROR) {
      printUsage();
    }

    // Add an extra space systematically
    System.out.println();

    return returnValue;
  }

@@ -315,8 +310,9 @@
    else if (shouldPrintUsage()) {
      printUsage();
    } else if (isCli()) {
      int exitCode = launchCli(args, createCliApplication());
      preExit();
      CliApplication cliApp = createCliApplication();
      int exitCode = launchCli(args, cliApp);
      preExit(cliApp);
      System.exit(exitCode);
    } else {
      willLaunchGui();
@@ -331,20 +327,28 @@
        {
          guiLaunchFailed(null);
        }
        exitCode = launchCli(args, createCliApplication());
        CliApplication cliApp = createCliApplication();
        exitCode = launchCli(args, cliApp);
        if (exitCode != 0) {
          preExit();
          preExit(cliApp);
          System.exit(exitCode);
        }
      }
    }
  }

  private void preExit() {
    File logFile = QuickSetupLog.getLogFile();
    if (logFile != null) {
      System.out.println(getMsg("general-see-for-details",
            QuickSetupLog.getLogFile().getPath()));
  private void preExit(CliApplication cliApp) {
    UserData ud = cliApp.getUserData();
    if (ud != null && !ud.isSilent()) {

      // Add an extra space systematically
      System.out.println();

      File logFile = QuickSetupLog.getLogFile();
      if (logFile != null) {
        System.out.println(getMsg("general-see-for-details",
              QuickSetupLog.getLogFile().getPath()));
      }
    }
  }