Commit 3a768e26 authored by Ed Reel's avatar Ed Reel Committed by Chris Thurber

Rearrange crew dependency install order (#3265)

Fixes issue when curl is installed before brotli or libmetalink

Fixes issue when gtk3 is installed before shared_mime_info

Fixes issue when sommelier is installed before other dependencies and the postinstall message is missed

Bump crew version
parent 8ecee2c6
...@@ -659,8 +659,21 @@ def resolve_dependencies ...@@ -659,8 +659,21 @@ def resolve_dependencies
return if @dependencies.empty? return if @dependencies.empty?
puts "The following packages also need to be installed: " puts "The following packages also need to be installed: "
i = 0
last_deps = []
last_packages = ["curl", "gtk3", "sommelier"]
@dependencies.each do |dep|
if last_packages.include?(dep)
@dependencies.delete_at(i)
last_deps.push(dep)
end
i += 1
end
@dependencies.concat last_deps.sort
@dependencies.each do |dep| @dependencies.each do |dep|
print dep + " " print dep + " "
end end
......
# Defines common constants used in different parts of crew # Defines common constants used in different parts of crew
CREW_VERSION = '1.2.3' CREW_VERSION = '1.2.4'
ARCH = `uname -m`.strip ARCH = `uname -m`.strip
ARCH_LIB = if ARCH == 'x86_64' then 'lib64' else 'lib' end ARCH_LIB = if ARCH == 'x86_64' then 'lib64' else 'lib' end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment