Split out message surfacing improvment to separate PR.

donoghuc · donoghuc · commit a21b70a7c9d9 · 2025-03-13T11:17:38.000-07:00
Moved to: #17310
diff --git a/rakelib/artifacts.rake b/rakelib/artifacts.rake
@@ -127,34 +127,12 @@ namespace "artifact" do
     result
   end
 
-  ##
-  # @override safe_system([env,] command... [,options])
-  # execute Kernel#system call,checking the exit status of the executed command and eventually reporting as exception
+  # execute Kernel#system call,checking the exist status of the executed command and eventually reporting as exception
   def safe_system(*args)
-    command = args.dup # avoid mutating input for reporting
-    env = command.size > 1 && command.first.kind_of?(Hash) ? command.shift : {}
-    options = command.size > 1 && command.last.kind_of?(Hash) ? command.pop : {}
-    fail("unsupported options #{options}") unless options.empty?
-
-    # Normalize command to a single string from either a multi-word string
-    # or an array of individual words
-    command = command.size > 1 ? Shellwords.join(command.map(&:to_s)) : command.first.to_s
-
-    # prepend the environment
-    env.each do |k,v|
-      command.prepend("#{Shellwords.escape(k.to_s)}=#{Shellwords.escape(v.to_s)} ")
-    end
-
-    output = `#{command} 2>&1`
-    status = $?
-
-    if !status.success?
-      puts "Command failed: #{args.inspect}"
-      puts "Output: #{output}"
+    if !system(*args)
+      status = $?
       raise "Got exit status #{status.exitstatus} attempting to execute #{args.inspect}!"
     end
-
-    true
   end
 
   desc "Generate rpm, deb, tar and zip artifacts"
diff --git a/rubyUtils.gradle b/rubyUtils.gradle
@@ -158,16 +158,10 @@ void rake(File projectDir, File buildDir, String task) {
         jruby.currentDirectory = projectDir
         jruby.runScriptlet("require 'rake'; require 'time'")
         jruby.runScriptlet("""
-                begin
-                    rake = Rake.application
-                    rake.init
-                    rake.load_rakefile
-                    rake['${task}'].invoke
-                rescue => e
-                    puts "Rake task error: #{e.class}: #{e.message}"
-                    puts "Backtrace: #{e.backtrace.join("\\n")}"
-                    raise e
-                end
+                rake = Rake.application
+                rake.init
+                rake.load_rakefile
+                rake['${task}'].invoke
                 """
         )
     }
