Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' into express
Conflicts:
	bin/node-template.coffee
	npm-shrinkwrap.json
	package.json
  • Loading branch information
winton committed Sep 13, 2012
2 parents 30e1bfc + ad24459 commit 875f8a2
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 16 deletions.
4 changes: 3 additions & 1 deletion bin/node-template.coffee
Expand Up @@ -79,7 +79,7 @@ module.exports = class Bin

_.each @overwrite, (body, path) ->
body = body.replace(/\n/g, "\\n").replace(/"/g, "\\\"")
commands.push "([[ -f #{path} ]] && echo \"#{body}\" > #{path} || true)"
commands.push "echo \"#{body}\" > #{path}"

@executing(commands)

Expand Down Expand Up @@ -117,6 +117,8 @@ module.exports = class Bin
(error, stdout, stderr) ->
if error
console.log "\nError :(".bold.red
console.log error
console.log stdout
console.log stderr
else
console.log "\nSuccess :)\n".bold.green
Expand Down
26 changes: 11 additions & 15 deletions package.json
@@ -1,24 +1,20 @@
{
"name" : "node-template",
"version": "0.1.2",
"bin" : { "node-template": "./bin/node-template" },
"name": "node-template",
"version": "0.1.5",
"bin": {
"node-template": "./bin/node-template"
},
"dependencies": {
"async" : "",
"backbone" : "",
"connect-redis": "",
"express" : "",
"glob" : "",
"nodetime" : "",
"redis" : "",
"underscore" : ""
"async": "",
"colors": "",
"glob": "",
"underscore": ""
},
"devDependencies": {
"chai" : "",
"coffee-script": "",
"colors" : "",
"mocha" : "",
"sinon" : "",
"supervisor" : ""
"mocha": "",
"sinon": ""
},
"scripts": {
"start": "supervisor -e 'js|coffee' -w 'lib,node_modules' lib/server.js",
Expand Down

0 comments on commit 875f8a2

Please sign in to comment.