Remove carriage return characters when loading configuration files.

JustinPihony · web-flow · commit ee262e0ce73e · 2017-12-12T23:02:55.000-05:00
Fixes sbt#1074
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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ run() {`
`263`	`263`
`264`	`264`	`# Loads a configuration file full of default command line options for this script.`
`265`	`265`	`loadConfigFile() {`
`266`		`- cat "$1" \| sed '/^\#/d'`
	`266`	`+ cat "$1" \| sed '/^\#/d;s/\r$//'`
`267`	`267`	`}`
`268`	`268`
`269`	`269`	`# Now check to see if it's a good enough version`