From cc2087a3eb28d7e56a7668ecc4a21b508863232a Mon Sep 17 00:00:00 2001
From: Benjamin Lupton <b@lupton.cc>
Date: Fri, 19 Oct 2012 11:09:06 +1100
Subject: [PATCH] Fixed --port CLI option not working (among possibly others)

---
 package.json                      | 2 +-
 src/lib/docpad.coffee             | 2 +-
 src/lib/interfaces/console.coffee | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 91d9d07b..53f2cf96 100755
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
 		"bal-util": ">=1.13.8 <1.14",
 		"caterpillar": "1.1.x",
 		"coffee-script": "1.3.x",
-		"commander": "0.6.x",
+		"commander": "1.0.x",
 		"cson": "1.2.x",
 		"express": "3.0.x",
 		"growl": "1.4.x",
diff --git a/src/lib/docpad.coffee b/src/lib/docpad.coffee
index c033555a..6da4bf9d 100755
--- a/src/lib/docpad.coffee
+++ b/src/lib/docpad.coffee
@@ -814,7 +814,7 @@ class DocPad extends EventEmitterEnhanced
 
 			# Get environments
 			@initialConfig.port ?= process.env.PORT ? process.env.VCAP_APP_PORT ? process.env.VMC_APP_PORT ? 9778
-			@initialConfig.env ?= process.env.NODE_ENV or 'development'
+			@initialConfig.env or= process.env.NODE_ENV or 'development'
 			@config.env = @instanceConfig.env or @websiteConfig.env or @websitePackageConfig.env or @initialConfig.env
 			envs = @getEnvironments()
 
diff --git a/src/lib/interfaces/console.coffee b/src/lib/interfaces/console.coffee
index af48e5ad..aed26c10 100755
--- a/src/lib/interfaces/console.coffee
+++ b/src/lib/interfaces/console.coffee
@@ -241,12 +241,12 @@ class ConsoleInterface
 
 		# Apply global configuration
 		for own key, value of commanderConfig
-			if sourceConfig[key]?
+			if typeof sourceConfig[key] isnt 'undefined'
 				config[key] = value
 
 		# Apply custom configuration
 		for own key, value of customConfig
-			if sourceConfig[key]?
+			if typeof sourceConfig[key] isnt 'undefined'
 				config[key] = value
 
 		# Return config object