From 246575390aa8abe98e71b5a71201ae93d283178e Mon Sep 17 00:00:00 2001
From: Paul Betts <paul@paulbetts.org>
Date: Tue, 16 Sep 2014 15:41:57 -0700
Subject: [PATCH] Use ERB templates from Underscore-Plus

---
 build/tasks/create-installer.coffee                | 5 +++--
 build/windows/{atom.nuspec.hbs => atom.nuspec.erb} | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)
 rename build/windows/{atom.nuspec.hbs => atom.nuspec.erb} (92%)

diff --git a/build/tasks/create-installer.coffee b/build/tasks/create-installer.coffee
index 4f74073d7..677e29455 100644
--- a/build/tasks/create-installer.coffee
+++ b/build/tasks/create-installer.coffee
@@ -1,5 +1,6 @@
 fs = require 'fs'
 path = require 'path'
+_ = require 'underscore-plus'
 
 module.exports = (grunt) ->
   {spawn} = require('./task-helpers')(grunt)
@@ -14,10 +15,10 @@ module.exports = (grunt) ->
     atomDir = path.join(buildDir, 'Atom')
 
     packageInfo = JSON.parse(fs.readFileSync(path.join(atomDir, 'resources', 'app', 'package.json'), {encoding: 'utf8'}))
-    inputTemplate = fs.readFileSync(path.join('build', 'windows', 'atom.nuspec.hbs'), {encoding: 'utf8'})
+    inputTemplate = fs.readFileSync(path.join('build', 'windows', 'atom.nuspec.erb'), {encoding: 'utf8'})
 
     targetNuspecPath = path.join(buildDir, 'atom.nuspec')
-    fs.writeFileSync(targetNuspecPath, inputTemplate.replace(/{{version}}/, packageInfo.version))
+    fs.writeFileSync(targetNuspecPath, _.template(inputTemplate, packageInfo))
 
     cmd = 'build/windows/nuget.exe'
     args = ['pack', targetNuspecPath, '-BasePath', atomDir, '-OutputDirectory', buildDir]
diff --git a/build/windows/atom.nuspec.hbs b/build/windows/atom.nuspec.erb
similarity index 92%
rename from build/windows/atom.nuspec.hbs
rename to build/windows/atom.nuspec.erb
index 503e4d4a9..28eea52b9 100644
--- a/build/windows/atom.nuspec.hbs
+++ b/build/windows/atom.nuspec.erb
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
-        <id>atom</id>
-        <version>{{version}}</version>
+        <id><%= name %></id>
+        <version><%= version %></version>
         <authors>The Atom Community</authors>
         <owners>The Atom Community</owners>
         <iconUrl>http://f.cl.ly/items/0X3B1j1j010I0X1p3l0S/atom.ico</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>Atom for Windows</description>
+        <description><%= description %></description>
     </metadata>
     <files>
         <file src="locales\**" target="lib\net45\locales" />