fix -d without -n vcap_dev bug

This commit fixes a but that happens if you run vcap_dev
with a -d option but not a -n option.  (The old
code would leave options["name"] uninitialized)

Change-Id: I820a7fd5ce10f11af96b15f970d3a0b358fec49c

dev_setup/bin/vcap_dev

@@ -22,15 +22,14 @@ opts = OptionParser.new do |opts|
 end
 opts.order!(ARGV)
 
-if options.empty?
-  options["name"], options["home"] = Deployment.get_deployment_target
+options["name"], options["home"] = Deployment.get_deployment_target if options.empty?
+
 if options["name"]
   puts "Targeting deployment \"#{options["name"]}\" with cloudfoundry home \"#{options["home"]}\""
 else
-    options["name"] ||= DEPLOYMENT_DEFAULT_NAME
+  options["name"] = DEPLOYMENT_DEFAULT_NAME
   puts "Targeting default deployment \"#{options["name"]}\""
 end
-end
 
 if ARGV[0].nil? || !%w[start stop restart tail status].include?(ARGV[0].downcase)
     STDERR.puts "Usage: #{$0} [-n deployment_name] [-d cloudfoundry_home_dir] [start|stop|restart|tail|status]"