Commit 8d569683 authored by Kevin Perkins's avatar Kevin Perkins Committed by GitHub

crew: Replace '-' with '_' once instead of many times (for #5050) (#5054)

parent d92e9147
...@@ -55,6 +55,7 @@ ENV["XZ_OPT"] = ENV['CREW_XZ_OPT'] || "-7e -T #{CREW_NPROC}" ...@@ -55,6 +55,7 @@ ENV["XZ_OPT"] = ENV['CREW_XZ_OPT'] || "-7e -T #{CREW_NPROC}"
require_relative 'lib/docopt' require_relative 'lib/docopt'
begin begin
args = Docopt::docopt(DOC) args = Docopt::docopt(DOC)
args['<name>'] = args['<name>'].map { |arg| arg.gsub('-','_') } if args['<name>']
rescue Docopt::Exit => e rescue Docopt::Exit => e
if ARGV[0] then if ARGV[0] then
if ARGV[0] == '-V' or ARGV[0] == '--version' then if ARGV[0] == '-V' or ARGV[0] == '--version' then
...@@ -949,7 +950,7 @@ end ...@@ -949,7 +950,7 @@ end
def build_command (args) def build_command (args)
args["<name>"].each do |name| args["<name>"].each do |name|
@pkgName = name.gsub('-', '_') @pkgName = name
search @pkgName search @pkgName
print_current_package @opt_verbose print_current_package @opt_verbose
resolve_dependencies_and_build resolve_dependencies_and_build
...@@ -958,7 +959,7 @@ end ...@@ -958,7 +959,7 @@ end
def download_command (args) def download_command (args)
args["<name>"].each do |name| args["<name>"].each do |name|
@pkgName = name.gsub('-', '_') @pkgName = name
search @pkgName search @pkgName
print_current_package @opt_verbose print_current_package @opt_verbose
download download
...@@ -977,7 +978,7 @@ end ...@@ -977,7 +978,7 @@ end
def files_command (args) def files_command (args)
args["<name>"].each do |name| args["<name>"].each do |name|
@pkgName = name.gsub('-', '_') @pkgName = name
search @pkgName search @pkgName
print_current_package print_current_package
files name files name
...@@ -995,7 +996,7 @@ end ...@@ -995,7 +996,7 @@ end
def install_command (args) def install_command (args)
args["<name>"].each do |name| args["<name>"].each do |name|
@pkgName = name.gsub('-', '_') @pkgName = name
search @pkgName search @pkgName
print_current_package true print_current_package true
@pkg.build_from_source = true if @opt_src or @opt_recursive @pkg.build_from_source = true if @opt_src or @opt_recursive
...@@ -1017,7 +1018,7 @@ end ...@@ -1017,7 +1018,7 @@ end
def postinstall_command (args) def postinstall_command (args)
args["<name>"].each do |name| args["<name>"].each do |name|
@pkgName = name.gsub('-', '_') @pkgName = name
search @pkgName, true search @pkgName, true
if @device[:installed_packages].any? do |elem| elem[:name] == @pkgName end if @device[:installed_packages].any? do |elem| elem[:name] == @pkgName end
@pkg.postinstall @pkg.postinstall
...@@ -1029,7 +1030,7 @@ end ...@@ -1029,7 +1030,7 @@ end
def reinstall_command (args) def reinstall_command (args)
args["<name>"].each do |name| args["<name>"].each do |name|
@pkgName = name.gsub('-', '_') @pkgName = name
search @pkgName search @pkgName
print_current_package print_current_package
@pkg.build_from_source = true if @opt_src or @opt_recursive @pkg.build_from_source = true if @opt_src or @opt_recursive
...@@ -1043,13 +1044,13 @@ end ...@@ -1043,13 +1044,13 @@ end
def remove_command (args) def remove_command (args)
args["<name>"].each do |name| args["<name>"].each do |name|
remove name.gsub('-', '_') remove name
end end
end end
def search_command (args) def search_command (args)
args["<name>"].each do |name| args["<name>"].each do |name|
regexp_search name.gsub('-', '_') regexp_search name
end.empty? and begin end.empty? and begin
list_packages list_packages
end end
...@@ -1061,7 +1062,7 @@ end ...@@ -1061,7 +1062,7 @@ end
def upgrade_command (args) def upgrade_command (args)
args["<name>"].each do |name| args["<name>"].each do |name|
@pkgName = name.gsub('-', '_') @pkgName = name
search @pkgName search @pkgName
print_current_package print_current_package
@pkg.build_from_source = true if @opt_src @pkg.build_from_source = true if @opt_src
......
# Defines common constants used in different parts of crew # Defines common constants used in different parts of crew
CREW_VERSION = '1.7.3' CREW_VERSION = '1.7.4'
ARCH_ACTUAL = `uname -m`.strip ARCH_ACTUAL = `uname -m`.strip
# This helps with virtualized builds on aarch64 machines # This helps with virtualized builds on aarch64 machines
......
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