From 9e1470684f671269a785fccccd3b87fc75c81ecf Mon Sep 17 00:00:00 2001 From: Adam Vandenberg Date: Thu, 30 Sep 2010 10:17:41 -0700 Subject: [PATCH] Coerce ENV.append/prepend values to strings. Signed-off-by: Adam Vandenberg --- Library/Homebrew/extend/ENV.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index 9edb70f051..e2e0931315 100644 --- a/Library/Homebrew/extend/ENV.rb +++ b/Library/Homebrew/extend/ENV.rb @@ -201,18 +201,22 @@ module HomebrewEnvExtension end def prepend key, value, separator = ' ' + # Value should be a string, but if it is a pathname then coerce it. + value = value.to_s unless self[key].to_s.empty? self[key] = value + separator + self[key] else self[key] = value end end + def append key, value, separator = ' ' - ref = self[key] - if ref.nil? or ref.empty? - self[key] = value + # Value should be a string, but if it is a pathname then coerce it. + value = value.to_s + unless self[key].to_s.empty? + self[key] = self[key] + separator + value else - self[key] = ref + separator + value + self[key] = value end end