Merge pull request #280 from BIAINC/windows/host-support

Strip Windows Line Endings
This commit is contained in:
David Dollar
2013-01-14 05:10:01 -08:00
2 changed files with 2 additions and 2 deletions

View File

@@ -5,7 +5,7 @@ class Foreman::Env
attr_reader :entries
def initialize(filename)
@entries = File.read(filename).split("\n").inject({}) do |ax, line|
@entries = File.read(filename).gsub("\r\n","\n").split("\n").inject({}) do |ax, line|
if line =~ /\A([A-Za-z_0-9]+)=(.*)\z/
key = $1
case val = $2

View File

@@ -82,7 +82,7 @@ class Foreman::Procfile
private
def parse(filename)
File.read(filename).split("\n").map do |line|
File.read(filename).gsub("\r\n","\n").split("\n").map do |line|
if line =~ /^([A-Za-z0-9_]+):\s*(.+)$/
[$1, $2]
end