From 446ca112d61e3a0f442c9c7d04ef9afaf5a71219 Mon Sep 17 00:00:00 2001 From: "chromebrew-actions[bot]" <220035932+chromebrew-actions[bot]@users.noreply.github.com> Date: Sun, 27 Jul 2025 12:42:38 -0500 Subject: [PATCH] Fix upx install when not installed. (#12271) Signed-off-by: Satadru Pramanik Co-authored-by: Satadru Pramanik --- bin/crew | 4 ++-- lib/const.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/crew b/bin/crew index 7fea6c8b1..78db8fd6e 100755 --- a/bin/crew +++ b/bin/crew @@ -900,7 +900,7 @@ def expand_binaries_and_fix_interpreter_path(dir) Dir.chdir dir do puts "Running upx to uncompress binaries #{'and patchelf to patch binary interpreter paths ' unless CREW_GLIBC_INTERPRETER.blank?}if needed.".lightblue abort('No Patchelf found!').lightred unless File.file?("#{CREW_PREFIX}/bin/patchelf") - abort('No Upx found!').lightred unless File.file?("#{CREW_PREFIX}/bin/upx") + puts 'No Upx found!'.lightred unless File.file?("#{CREW_PREFIX}/bin/upx") # Look for installed binaries and libraries in the package install # directory tree. execfiles = Find.find(Dir.pwd).select { |p| File.executable?(p) } @@ -919,7 +919,7 @@ def expand_binaries_and_fix_interpreter_path(dir) pool.post do # Decompress the binary if compressed. - system "upx -qq -d #{execfiletopatch}", %i[err] => File::NULL, exception: false + system "upx -qq -d #{execfiletopatch}", %i[err] => File::NULL, exception: false if File.file?("#{CREW_PREFIX}/bin/upx") # Check for existing interpreter. next if CREW_GLIBC_INTERPRETER.blank? diff --git a/lib/const.rb b/lib/const.rb index 55cf20a0f..45d1ad019 100644 --- a/lib/const.rb +++ b/lib/const.rb @@ -4,7 +4,7 @@ require 'etc' require 'open3' OLD_CREW_VERSION ||= defined?(CREW_VERSION) ? CREW_VERSION : '1.0' -CREW_VERSION ||= '1.63.3' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION +CREW_VERSION ||= '1.63.4' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION # Kernel architecture. KERN_ARCH ||= Etc.uname[:machine]