Commit ab244a9a authored by Casey Strouse's avatar Casey Strouse Committed by GitHub

Merge pull request #4115 from uberhacker/update-crew-command

Fix install message output and add ghc to last_packages
parents 297bd5b8 cae4e83b
...@@ -646,6 +646,9 @@ end ...@@ -646,6 +646,9 @@ end
def install_package (pkgdir) def install_package (pkgdir)
Dir.chdir pkgdir do Dir.chdir pkgdir do
# install filelist, dlist and binary files
puts "Performing install..."
FileUtils.mv 'dlist', CREW_CONFIG_PATH + "meta/#{@pkg.name}.directorylist" FileUtils.mv 'dlist', CREW_CONFIG_PATH + "meta/#{@pkg.name}.directorylist"
FileUtils.mv 'filelist', CREW_CONFIG_PATH + "meta/#{@pkg.name}.filelist" FileUtils.mv 'filelist', CREW_CONFIG_PATH + "meta/#{@pkg.name}.filelist"
...@@ -735,7 +738,7 @@ def resolve_dependencies ...@@ -735,7 +738,7 @@ def resolve_dependencies
i = 0 i = 0
last_deps = [] last_deps = []
last_packages = ["curl", "mandb", "gtk3", "sommelier"] last_packages = ["curl", "ghc", "mandb", "gtk3", "sommelier"]
@dependencies.each do |dep| @dependencies.each do |dep|
if last_packages.include?(dep) if last_packages.include?(dep)
@dependencies.delete_at(i) @dependencies.delete_at(i)
...@@ -805,9 +808,6 @@ def install ...@@ -805,9 +808,6 @@ def install
end end
unless @pkg.is_fake? unless @pkg.is_fake?
# install filelist, dlist and binary files
puts "Installing..."
# perform pre-install process # perform pre-install process
pre_install dest_dir pre_install dest_dir
......
# Defines common constants used in different parts of crew # Defines common constants used in different parts of crew
CREW_VERSION = '1.4.1' CREW_VERSION = '1.4.2'
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