Merge pull request #2150 from daniel-beck/JENKINS-33705

[FIX JENKINS-33705] Use platform line endings
jenkinsci · Mar 23, 2016 · 3fdd866 · 3fdd866
2 parents 82d3eb8 + 012a92e
commit 3fdd866
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/core/src/main/java/jenkins/install/SetupWizard.java b/core/src/main/java/jenkins/install/SetupWizard.java
@@ -106,24 +106,24 @@ public SetupWizard(Jenkins j) throws IOException, InterruptedException {
                 bc.abort();
             }
         }
-        
+
         String setupKey = iapf.readToString().trim();
-
-        LOGGER.info("\n\n*************************************************************\n"
-                + "*************************************************************\n"
-                + "*************************************************************\n"
-                + "\n"
+        String ls = System.lineSeparator();
+        LOGGER.info(ls + ls + "*************************************************************" + ls
+                + "*************************************************************" + ls
+                + "*************************************************************" + ls
+                + ls
                 + "Jenkins initial setup is required. An admin user has been created and"
-                + "a password generated. \n"
-                + "Please use the following password to proceed to installation: \n"
-                + "\n"
-                + "" + setupKey + "\n"
-                + "\n"
-                + "This may also be found at: " + iapf.getRemote() + "\n"
-                + "\n"
-                + "*************************************************************\n"
-                + "*************************************************************\n"
-                + "*************************************************************\n");
+                + "a password generated." + ls
+                + "Please use the following password to proceed to installation:" + ls
+                + ls
+                + setupKey + ls
+                + ls
+                + "This may also be found at: " + iapf.getRemote() + ls
+                + ls
+                + "*************************************************************" + ls
+                + "*************************************************************" + ls
+                + "*************************************************************" + ls);
 
         try {
             PluginServletFilter.addFilter(FORCE_SETUP_WIZARD_FILTER);