From ee262e0ce73ee45ff50857524d4028d50459ac22 Mon Sep 17 00:00:00 2001 From: Justin Pihony Date: Tue, 12 Dec 2017 23:02:55 -0500 Subject: [PATCH 1/2] Remove carriage return characters when loading configuration files. Fixes #1074 --- .../com/typesafe/sbt/packager/archetypes/scripts/bash-template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/com/typesafe/sbt/packager/archetypes/scripts/bash-template b/src/main/resources/com/typesafe/sbt/packager/archetypes/scripts/bash-template index 4957421c3..72fe27b24 100644 --- a/src/main/resources/com/typesafe/sbt/packager/archetypes/scripts/bash-template +++ b/src/main/resources/com/typesafe/sbt/packager/archetypes/scripts/bash-template @@ -263,7 +263,7 @@ run() { # Loads a configuration file full of default command line options for this script. loadConfigFile() { - cat "$1" | sed '/^\#/d' + cat "$1" | sed '/^\#/d;s/\r$//' } # Now check to see if it's a good enough version From 4cb5ad044a9a0ea10fb7d6947cdeb2501842d675 Mon Sep 17 00:00:00 2001 From: Justin Pihony Date: Tue, 12 Dec 2017 23:06:58 -0500 Subject: [PATCH 2/2] Also fix ash-template --- .../com/typesafe/sbt/packager/archetypes/scripts/ash-template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/com/typesafe/sbt/packager/archetypes/scripts/ash-template b/src/main/resources/com/typesafe/sbt/packager/archetypes/scripts/ash-template index 9efd69686..4d7838dc9 100644 --- a/src/main/resources/com/typesafe/sbt/packager/archetypes/scripts/ash-template +++ b/src/main/resources/com/typesafe/sbt/packager/archetypes/scripts/ash-template @@ -40,7 +40,7 @@ fi # Loads a configuration file full of default command line options for this script. loadConfigFile() { - cat "$1" | sed '/^\#/d' | sed 's/^-J-X/-X/' | tr '\r\n' ' ' + cat "$1" | sed '/^\#/d;s/\r$//' | sed 's/^-J-X/-X/' | tr '\r\n' ' ' }