From 10840d3abba05e41cbdb215db3a5a38dea3c0fad Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 15 Jun 2017 02:33:56 +0000 Subject: make-snapshot: prefer default commands over 7z [ci skip] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59084 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- tool/make-snapshot | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'tool') diff --git a/tool/make-snapshot b/tool/make-snapshot index 3e66eea414..e3da768dbe 100755 --- a/tool/make-snapshot +++ b/tool/make-snapshot @@ -45,8 +45,12 @@ PACKAGES = { } if system("7z", out: IO::NULL) - PACKAGES["gzip"] = %w".tar.gz 7z a dummy -tgzip -mx -so" - PACKAGES["zip"] = %w".zip 7z a -tzip -mx" + unless system(PACKAGES["gzip"][1..-1], in: IO::NULL, out: IO::NULL, err: :close) + 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" + end end if gzip = ENV.delete("GZIP") PACKAGES["gzip"].concat(gzip.shellsplit) -- cgit v1.2.3