lib/capistrano-maven.rb in capistrano-maven-0.1.1 vs lib/capistrano-maven.rb in capistrano-maven-0.1.2

@@ -33,24 +33,28 @@
 
           ## Maven environment
           _cset(:mvn_common_environment, {})
           _cset(:mvn_default_environment) {
             environment = {}
-            environment["JAVA_HOME"] = fetch(:mvn_java_home) if exists?(:mvn_java_home)
-            if exists?(:mvn_java_options)
-              environment["MAVEN_OPTS"] = [ fetch(:mvn_java_options, []) ].flatten.join(" ")
+            if mvn_setup_remotely
+              environment["JAVA_HOME"] = fetch(:mvn_java_home) if exists?(:mvn_java_home)
+              if exists?(:mvn_java_options)
+                environment["MAVEN_OPTS"] = [ fetch(:mvn_java_options, []) ].flatten.join(" ")
+              end
+              environment["PATH"] = [ mvn_bin_path, "$PATH" ].join(":")
             end
-            environment["PATH"] = [ mvn_bin_path, "$PATH" ].join(":") if mvn_setup_remotely
             _merge_environment(mvn_common_environment, environment)
           }
           _cset(:mvn_default_environment_local) {
             environment = {}
-            environment["JAVA_HOME"] = fetch(:mvn_java_home_local) if exists?(:mvn_java_home_local)
-            if exists?(:mvn_java_options_local)
-              environment["MAVEN_OPTS"] = [ fetch(:mvn_java_options_local, []) ].flatten.join(" ")
+            if mvn_setup_locally
+              environment["JAVA_HOME"] = fetch(:mvn_java_home_local) if exists?(:mvn_java_home_local)
+              if exists?(:mvn_java_options_local)
+                environment["MAVEN_OPTS"] = [ fetch(:mvn_java_options_local, []) ].flatten.join(" ")
+              end
+              environment["PATH"] = [ mvn_bin_path_local, "$PATH" ].join(":")
             end
-            environment["PATH"] = [ mvn_bin_path_local, "$PATH" ].join(":") if mvn_setup_locally
             _merge_environment(mvn_common_environment, environment)
           }
           _cset(:mvn_environment) { _merge_environment(mvn_default_environment, fetch(:mvn_extra_environment, {})) }
           _cset(:mvn_environment_local) { _merge_environment(mvn_default_environment_local, fetch(:mvn_extra_environment_local, {})) }
           def _command(cmdline, options={})
@@ -334,10 +338,10 @@
               logger.trace("executing locally: #{cmdline.dump}")
               elapsed = Benchmark.realtime do
                 system(cmdline)
               end
               if $?.to_i > 0 # $? is command exit code (posix style)
-                raise Capistrano::LocalArgumentError, "Command #{cmd} returned status code #{$?}"
+                raise Capistrano::LocalArgumentError, "Command #{cmdline} returned status code #{$?}"
               end
               logger.trace "command finished in #{(elapsed * 1000).round}ms"
             end
           end
         }