commit 5860bb9ea80861a285c38822b82d612d04e82178
author zack-shoylev <zack.shoylev@rackspace.com> Mon Jul 01 00:47:41 2013 +0200
committer Ignasi Barrera <ignasi.barrera@gmail.com> Mon Jul 01 00:48:33 2013 +0200
tree a8f2b1ab74f918d7b1ee5ef50c32c9a859f5c434
parent 0301a30899a4df822992a9f18638c768ca656e07

Ensuring pem files are properly split regardless of source OS

core/src/main/java/org/jclouds/chef/functions/GroupToBootScript.java

diff --git a/core/src/main/java/org/jclouds/chef/functions/GroupToBootScript.java b/core/src/main/java/org/jclouds/chef/functions/GroupToBootScript.java
index 3ad9024..0acd51d 100644
--- a/core/src/main/java/org/jclouds/chef/functions/GroupToBootScript.java
+++ b/core/src/main/java/org/jclouds/chef/functions/GroupToBootScript.java
@@ -28,6 +28,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Pattern;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -56,6 +57,8 @@
  */
 @Singleton
 public class GroupToBootScript implements Function<String, Statement> {
+   private static final Pattern newLinePattern = Pattern.compile("(\\r\\n)|(\\n)");
+
    @VisibleForTesting
    static final Type RUN_LIST_TYPE = new TypeLiteral<Map<String, List<String>>>() {
    }.getType();
@@ -95,8 +98,8 @@
                         .format("validation_client_name \"%s\"", validatorClientName), String.format(
                         "chef_server_url \"%s\"", endpoint.get())));
 
-      Statement createValidationPem = appendFile(chefConfigDir + "{fs}validation.pem", Splitter.on('\n').split(
-               Pems.pem(validatorKey)));
+      Statement createValidationPem = appendFile(chefConfigDir + "{fs}validation.pem", Splitter.on(newLinePattern)
+            .split(Pems.pem(validatorKey)));
 
       String chefBootFile = chefConfigDir + "{fs}first-boot.json";