From ad96ddd09e87ee1cc24c6104f2b3f6a54a6105af Mon Sep 17 00:00:00 2001 From: Cassandra Watergate <55339220+saltedcoffii@users.noreply.github.com> Date: Tue, 13 Apr 2021 13:01:26 -0400 Subject: [PATCH] fix directory already exists error (#5600) * fix directory already exists error * crew: rubyize /dev/urandom * lib.const.rb: bump crew version Co-authored-by: Ed Reel --- crew | 3 ++- lib/const.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/crew b/crew index 940dbcccf..c51d3788c 100755 --- a/crew +++ b/crew @@ -10,6 +10,7 @@ require 'uri' require 'digest/sha2' require 'json' require 'fileutils' +require 'securerandom' require_relative 'lib/const' require_relative 'lib/util' @@ -588,7 +589,7 @@ def download end def unpack (meta) - extract_dir = meta[:filename] + '.dir' + extract_dir = meta[:filename] + '.' + SecureRandom.alphanumeric(8) + '.dir' target_dir = nil Dir.chdir CREW_BREW_DIR do FileUtils.mkdir_p extract_dir, verbose: @fileutils_verbose diff --git a/lib/const.rb b/lib/const.rb index 73a4a3efd..75179f1e8 100644 --- a/lib/const.rb +++ b/lib/const.rb @@ -1,6 +1,6 @@ # Defines common constants used in different parts of crew -CREW_VERSION = '1.8.2' +CREW_VERSION = '1.8.3' ARCH_ACTUAL = `uname -m`.strip # This helps with virtualized builds on aarch64 machines