summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-06-15 02:33:57 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-06-15 02:33:57 +0000
commit95797e13d4a32d5ec3222f223b7d4a37d24a2452 (patch)
tree6f5459b155b3721b9e73d49d8dae7fdbcdca3904
parent4d4fabafb32bdd17f7ab3468955750699bb80852 (diff)
make-snapshot: suppress output from 7z [ci skip]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59086 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rwxr-xr-xtool/make-snapshot10
1 files changed, 8 insertions, 2 deletions
diff --git a/tool/make-snapshot b/tool/make-snapshot
index e3da768dbe..affc412fb7 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -49,7 +49,7 @@ if system("7z", out: IO::NULL)
PACKAGES["gzip"] = %w".tar.gz 7z a dummy -tgzip -mx -so"
end
unless system(PACKAGES["zip"][1..-1], in: IO::NULL, out: IO::NULL, err: :close)
- PACKAGES["zip"] = %w".zip 7z a -tzip -mx"
+ PACKAGES["zip"] = %w".zip 7z a -tzip -mx" << {out: IO::NULL}
end
end
if gzip = ENV.delete("GZIP")
@@ -392,7 +392,13 @@ update-gems:
done = system(*cmd, tarball, out: file)
else
print "creating #{mesg} archive... #{file}"
- done = system(*cmd, file, v)
+ if Hash === cmd.last
+ *cmd, opt = *cmd
+ cmd << file << v << opt
+ else
+ (cmd = cmd.dup) << file << v
+ end
+ done = system(*cmd)
end
if done
puts " done"