Remove carriage return characters when loading configuration files. (#1078)

* Remove carriage return characters when loading configuration files.

Fixes #1074

* Also fix ash-template

Author: JustinPihony

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' ' '
 }
 
 

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