github/chromebrew
1
1
Fork 0
mirror of https://github.com/chromebrew/chromebrew.git synced 2026-01-09 15:37:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

crew: Simplify syntax and use fileutils (#4958)

Browse Source 
* Update crew

* Add files via upload

* Update const.rb

Co-authored-by: supechicken666 <68530202+supechicken666@users.noreply.github.com>
This commit is contained in:
supechicken
2021-01-24 00:52:11 +08:00
committed by GitHub
parent dbc933020c
commit f436adf74f
2 changed files with 92 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

230
crew
View File

@@ -2,7 +2,7 @@
require_relative 'lib/color'
# Disallow sudo
abort "Chromebrew should not be run as root.".lightred if Process.uid == 0
abort 'Chromebrew should not be run as root.'.lightred if Process.uid == 0
require 'find'
require 'net/http'
@@ -47,11 +47,7 @@ DOCOPT
# Set XZ_OPT environment variable for build command.
# If CREW_XZ_OPT is defined, use it by default. Use `-7e`, otherwise.
if ENV["CREW_XZ_OPT"].to_s == ''
ENV["XZ_OPT"] = "-7e -T #{CREW_NPROC}"
else
ENV["XZ_OPT"] = ENV["CREW_XZ_OPT"]
end
ENV["XZ_OPT"] = ENV['CREW_XZ_OPT'] || "-7e -T #{CREW_NPROC}"
# Parse arguments using docopt
require_relative 'lib/docopt'
@@ -60,7 +56,7 @@ begin
rescue Docopt::Exit => e
if ARGV[0] then
if ARGV[0] == '-V' or ARGV[0] == '--version' then
puts "#{CREW_VERSION}"
puts CREW_VERSION
exit 0
end
if ARGV[0] != '-h' and ARGV[0] != '--help' then
@@ -70,7 +66,7 @@ rescue Docopt::Exit => e
if not cmds.include?(ARGV[0]) then
similar = cmds.select {|word| edit_distance(ARGV[0], word) < 4}
if not similar.empty? then
puts "Did you mean?"
puts 'Did you mean?'
similar.each {|sug| puts " #{sug}"}
end
end
@@ -82,6 +78,15 @@ end
@opt_keep = args["--keep"]
@opt_verbose = args["--verbose"]
if @opt_verbose then
@fileutils_verbose = ', verbose: true'
@verbose = '-v'
else
@fileutils_verbose = ''
@verbose = ''
end
@opt_src = args["--build-from-source"]
@opt_recursive = args["--recursive-build"]
@@ -114,7 +119,7 @@ def print_current_package (extra = false)
if extra
puts ""
puts @pkg.homepage if @pkg.homepage
print "version #{@pkg.version}"
print "Version: #{@pkg.version}"
end
puts ""
end
@@ -155,7 +160,7 @@ end
def list_installed
Dir["#{CREW_CONFIG_PATH}/meta/*.directorylist"].sort.map { |f|
File.basename(f, ".directorylist").lightgreen
File.basename(f, '.directorylist').lightgreen
}
end
@@ -310,7 +315,7 @@ end
def const (var)
if var
value = eval(var)
puts "#{var}=#{value}"
puts var + '=' + value
else
vars = [
'ARCH',
@@ -344,14 +349,14 @@ def const (var)
]
vars.each { |var|
value = eval(var)
puts "#{var}=#{value}"
puts var + '=' + value
}
end
end
def files (pkgName)
filelist = "#{CREW_PREFIX}/etc/crew/meta/#{pkgName}.filelist"
if File.exists? "#{filelist}"
if File.exists? filelist
system "sort #{filelist}"
lines = `wc -l "#{filelist}"`.strip.split(' ')[0].to_i
size = `cat #{filelist} | xargs -I {} du -b '{}' | awk '{ print; total += $1 }; END { print total }' | numfmt --suffix B --to=si | tail -1`
@@ -389,33 +394,33 @@ def whatprovides (pkgName)
end
def update
abort "`crew update` is used to update crew itself. Use `crew upgrade <package1> [<package2> ...]` to update specific packages.".orange if @pkgName
abort "'crew update' is used to update crew itself. Use 'crew upgrade <package1> [<package2> ...]' to update specific packages.".orange if @pkgName
#update package lists
Dir.chdir CREW_LIB_PATH do
system "git fetch origin master"
system "git reset --hard origin/master"
system 'git fetch origin master'
system 'git reset --hard origin/master'
end
puts "Package lists, crew, and library updated."
puts 'Package lists, crew, and library updated.'
#update compatible packages
puts "Generating compatible packages..."
puts 'Generating compatible packages...'
generate_compatible
#check for outdated installed packages
puts "Checking for package updates..."
puts 'Checking for package updates...'
canBeUpdated = 0
@device[:installed_packages].each do |package|
search package[:name], true
if package[:version] != @pkg.version
canBeUpdated += 1
puts @pkg.name + " could be updated from " + package[:version] + " to " + @pkg.version
puts @pkg.name + ' could be updated from ' + package[:version] + ' to ' + @pkg.version
end
end
if canBeUpdated > 0
puts ""
puts
puts "Run `crew upgrade` to update all packages or `crew upgrade <package1> [<package2> ...]` to update specific packages."
else
puts "Your software is up to date.".lightgreen
@@ -466,7 +471,7 @@ def upgrade
end
if toBeUpdated.length > 0
puts "Updating packages..."
puts 'Updating packages...'
toBeUpdated.each do |package|
search package
print_current_package
@@ -504,13 +509,12 @@ def download
sha256sum = @pkg.binary_sha256[@device[:architecture]]
end
Dir.chdir CREW_BREW_DIR do
unless ENV["CREW_CACHE_OPT"].to_s == ''
unless File.directory?(CREW_CACHE_DIR)
FileUtils.mkdir_p(CREW_CACHE_DIR)
end
if File.file?("#{CREW_CACHE_DIR}#{filename}")
if Digest::SHA256.hexdigest( File.read("#{CREW_CACHE_DIR}#{filename}") ) == sha256sum then
FileUtils.cp "#{CREW_CACHE_DIR}#{filename}", "#{CREW_BREW_DIR}"
if ENV['CREW_CACHE_OPT']
FileUtils.mkdir_p CREW_CACHE_DIR
cachefile = CREW_CACHE_DIR + filename
if File.file?(cachefile)
if Digest::SHA256.hexdigest( File.read(cachefile) ) == sha256sum then
FileUtils.cp cachefile, CREW_BREW_DIR
puts "Archive found in cache".lightgreen
return {source: source, filename: filename}
else
@@ -519,18 +523,14 @@ def download
end
end
if @opt_verbose then
system('curl', '-v', '--retry', '3', '--progress-bar', '-C', '-', '--insecure', '-L', '-#', url, '-o', filename)
else
system('curl', '--retry', '3', '--progress-bar', '-C', '-', '--insecure', '-L', '-#', url, '-o', filename)
end
system "curl #{@verbose} --retry 3 --progress-bar -C - --insecure -L #{url} '-o' #{filename}"
abort 'Checksum mismatch. :/ Try again.'.lightred unless
Digest::SHA256.hexdigest( File.read("./#{filename}") ) == sha256sum
Digest::SHA256.hexdigest( File.read(filename) ) == sha256sum
puts "Archive downloaded".lightgreen
unless ENV["CREW_CACHE_OPT"].to_s == ''
puts "Caching downloaded archive".lightgreen
if ENV['CREW_CACHE_OPT']
puts 'Caching downloaded archive'.lightgreen
FileUtils.cp filename, CREW_CACHE_DIR
end
end
@@ -538,24 +538,24 @@ def download
end
def unpack (meta)
extract_dir = "#{meta[:filename]}.dir"
extract_dir = meta[:filename] + '.dir'
target_dir = nil
Dir.chdir CREW_BREW_DIR do
Dir.mkdir("#{extract_dir}") unless Dir.exist?("#{extract_dir}")
FileUtils.mkdir_p extract_dir
case File.basename meta[:filename]
when /\.zip$/i
puts "Unpacking archive using 'unzip', this may take a while..."
_verbopt = @opt_verbose ? '-v' : '-qq'
system "unzip", _verbopt, "-d", "#{extract_dir}", meta[:filename]
system 'unzip', _verbopt, '-d', extract_dir, meta[:filename]
when /\.(tar(\.(gz|bz2|xz|lz))?|tgz|tbz|txz)$/i
puts "Unpacking archive using 'tar', this may take a while..."
_verbopt = @opt_verbose ? 'v' : ''
system "tar", "x#{_verbopt}f", meta[:filename], "-C", "#{extract_dir}"
system 'tar', "x#{_verbopt}f", meta[:filename], '-C', extract_dir
end
if meta[:source] == true
# Check the number of directories in the archive
entries = Dir["#{extract_dir}/*"]
entries = Dir["#{extract_dir}/."] if entries.empty?
entries = Dir[extract_dir] if entries.empty?
if entries.length == 0
abort "Empty archive: #{meta[:filename]}".lightred
elsif entries.length == 1 && File.directory?(entries.first)
@@ -575,18 +575,14 @@ end
def build_and_preconfigure (target_dir)
Dir.chdir target_dir do
puts "Building from source, this may take a while..."
puts 'Building from source, this may take a while...'
# Rename *.la files temporily to *.la_tmp to avoid
# libtool: link: '*.la' is not a valid libtool archive.
# See https://gnunet.org/faq-la-files and
# https://stackoverflow.com/questions/42963653/libquadmath-la-is-not-a-valid-libtool-archive-when-configuring-openmpi-with-g
puts "Rename all *.la files to *.la_tmp".lightblue
if @opt_verbose then
system "find #{CREW_LIB_PREFIX} -type f -name *.la -print0 | xargs --null -I{} mv -v {} {}_tmp"
else
system "find #{CREW_LIB_PREFIX} -type f -name *.la -print0 | xargs --null -I{} mv {} {}_tmp"
end
puts 'Rename all *.la files to *.la_tmp'.lightblue
system "find #{CREW_LIB_PREFIX} -type f -name *.la -print0 | xargs --null -I{} mv #{@verbose} {} {}_tmp"
@pkg.in_build = true
@pkg.patch
@@ -594,35 +590,27 @@ def build_and_preconfigure (target_dir)
@pkg.build
@pkg.in_build = false
# wipe crew destdir
if @opt_verbose then
system "rm -rvf #{CREW_DEST_DIR}/*"
else
system "rm -rf #{CREW_DEST_DIR}/*"
end
puts "Preconfiguring package..."
FileUtils.rm_rf Dir.glob("#{CREW_DEST_DIR}/*") + @fileutils_verbose
puts 'Preconfiguring package...'
@pkg.install
# Rename all *.la_tmp back to *.la to avoid
# cannot access '*.la': No such file or directory
puts "Rename all *.la_tmp files back to *.la".lightblue
if @opt_verbose then
system "find #{CREW_LIB_PREFIX} -type f -name '*.la_tmp' -exec sh -c 'mv -v \"$1\" \"${1%.la_tmp}.la\"' _ {} \\;"
else
system "find #{CREW_LIB_PREFIX} -type f -name '*.la_tmp' -exec sh -c 'mv \"$1\" \"${1%.la_tmp}.la\"' _ {} \\;"
end
puts 'Rename all *.la_tmp files back to *.la'.lightblue
system "find #{CREW_LIB_PREFIX} -type f -name '*.la_tmp' -exec sh -c 'mv #{@verbose} \"$1\" \"${1%.la_tmp}.la\"' _ {} \\;"
end
end
def pre_install (dest_dir)
Dir.chdir dest_dir do
puts "Performing pre-install..."
puts 'Performing pre-install...'
@pkg.preinstall
end
end
def post_install (dest_dir)
Dir.chdir dest_dir do
puts "Performing post-install..."
puts 'Performing post-install...'
@pkg.postinstall
end
end
@@ -633,11 +621,7 @@ def compress_doc (dir)
if Dir.exist? dir
system "find #{dir} -type f ! -perm -200 | xargs -r chmod u+w"
if @opt_verbose then
system "compressdoc -v --gzip -9 #{dir}"
else
system "compressdoc --gzip -9 #{dir}"
end
system "compressdoc #{@verbose} --gzip -9 #{dir}"
end
end
@@ -650,21 +634,17 @@ def prepare_package (destdir)
compress_doc "#{CREW_DEST_PREFIX}/share/info"
# create file list
system "find . -type f > ../filelist"
system "find . -type l >> ../filelist"
system "cut -c2- ../filelist > filelist"
system 'find . -type f > ../filelist'
system 'find . -type l >> ../filelist'
system 'cut -c2- ../filelist > filelist'
# create directory list
system "find . -type d > ../dlist"
system "cut -c2- ../dlist > dlistcut"
system "tail -n +2 dlistcut > dlist"
system 'find . -type d > ../dlist'
system 'cut -c2- ../dlist > dlistcut'
system 'tail -n +2 dlistcut > dlist'
# remove temporary files
if @opt_verbose then
system "rm -vf dlistcut ../dlist ../filelist"
else
system "rm -f dlistcut ../dlist ../filelist"
end
"FileUtils.rm_rf ['dlistcut', '../dlist', '../filelist']#{@fileutils_verbose}"
end
end
@@ -680,7 +660,7 @@ end
def install_package (pkgdir)
Dir.chdir pkgdir do
# install filelist, dlist and binary files
puts "Performing install..."
puts 'Performing install...'
FileUtils.mv 'dlist', CREW_CONFIG_PATH + "meta/#{@pkg.name}.directorylist"
FileUtils.mv 'filelist', CREW_CONFIG_PATH + "meta/#{@pkg.name}.filelist"
@@ -692,19 +672,11 @@ def install_package (pkgdir)
# Strip binaries but not compressed archives
strip_find_files "find . -type f ! -iname '*\.bz2' ! -iname '*\.gz' ! -iname '*\.lha' ! -iname '*\.lz' ! -iname '*\.rar' ! -iname '*\.tar' ! -iname '*\.tbz' ! -iname '*\.tgz' ! -iname '\*.txz' ! -iname '*\.xz' ! -iname '*\.zip' -perm /111 -print | sed -e '/lib.*\.a$/d' -e '/lib.*\.so/d'"
if @opt_verbose then
if Dir.exists? "#{pkgdir}/home" then
system "tar cvf - ./usr/* ./home/* | (cd /; tar xp --keep-directory-symlink -f -)"
else
system "tar cvf - ./usr/* | (cd /; tar xp --keep-directory-symlink -f -)"
end
if Dir.exists? "#{pkgdir}/home" then
system "tar -cf #{@verbose} - ./usr/* ./home/* | (cd /; tar xp --keep-directory-symlink -f -)"
else
if Dir.exists? "#{pkgdir}/home" then
system "tar cf - ./usr/* ./home/* | (cd /; tar xp --keep-directory-symlink -f -)"
else
system "tar cf - ./usr/* | (cd /; tar xp --keep-directory-symlink -f -)"
system "tar -cf #{@verbose} - ./usr/* | (cd /; tar xp --keep-directory-symlink -f -)"
end
end
end
end
@@ -721,14 +693,8 @@ def resolve_dependencies_and_install
ensure
# cleanup
unless @opt_keep
Dir.chdir CREW_BREW_DIR do
if @opt_verbose then
system "rm -rvf *"
else
system "rm -rf *"
end
system "mkdir dest" # this is a little ugly, feel free to find a better way
end
FileUtils.rm_rf Dir.glob("#{CREW_BREW_DIR}/*")
FileUtils.mkdir_p "#{CREW_BREW_DIR}/dest" # this is a little ugly, feel free to find a better way
end
end
puts "#{@pkg.name.capitalize} installed!".lightgreen
@@ -767,7 +733,7 @@ def resolve_dependencies
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 = []
@@ -782,21 +748,21 @@ def resolve_dependencies
@dependencies.concat last_deps.sort
@dependencies.each do |dep|
print dep + " "
print dep + ' '
end
puts ""
print "Do you agree? [Y/n] "
puts
print 'Do you agree? [Y/n] '
response = STDIN.getc
case response
when "n"
abort "No changes made."
when "\n", "y", "Y"
puts "Proceeding..."
when 'n'
abort 'No changes made.'
when '\n', 'y', 'Y'
puts 'Proceeding...'
proceed = true
else
puts "I don't understand `#{response}`. :(".lightred
abort "No changes made."
abort 'No changes made.'
end
if proceed
@@ -818,7 +784,7 @@ def install
meta = download
target_dir = unpack meta
if meta[:source] == true
abort "You don't have a working C compiler. Run `crew install buildessential` to get one and try again.".lightred unless system("gcc", "--version")
abort "You don't have a working C compiler. Run `crew install buildessential` to get one and try again.".lightred unless system('gcc --version')
# build from source and place binaries at CREW_DEST_DIR
# CREW_DEST_DIR contains usr/local/... hierarchy
@@ -837,7 +803,7 @@ def install
# remove it just before the file copy
if @pkg.in_upgrade
puts "Removing since upgrade or reinstall..."
puts 'Removing since upgrade or reinstall...'
remove @pkg.name
end
@@ -877,22 +843,16 @@ def resolve_dependencies_and_build
ensure
#cleanup
unless @opt_keep
Dir.chdir CREW_BREW_DIR do
if @opt_verbose then
system "rm -rvf *"
else
system "rm -rf *"
end
system "mkdir dest" #this is a little ugly, feel free to find a better way
end
FileUtils.rm_rf Dir.glob("#{CREW_BREW_DIR}/*") + @fileutils_verbose
FileUtils.mkdir_p "#{CREW_BREW_DIR}/dest" #this is a little ugly, feel free to find a better way
end
end
puts "#{@pkg.name} is built!".lightgreen
end
def build_package (pwd)
abort "It is not possible to build a fake package".lightred if @pkg.is_fake?
abort "It is not possible to build without source".lightred if !@pkg.is_source?(@device[:architecture])
abort 'It is not possible to build a fake package'.lightred if @pkg.is_fake?
abort 'It is not possible to build without source'.lightred if !@pkg.is_source?(@device[:architecture])
# download source codes and unpack it
meta = download
@@ -905,7 +865,7 @@ def build_package (pwd)
# therefore it is possible place time consuming tests in the check method.
if Dir.exist? target_dir
Dir.chdir target_dir do
puts "Checking..."
puts 'Checking...'
@pkg.check
end
end
@@ -914,22 +874,14 @@ def build_package (pwd)
prepare_package CREW_DEST_DIR
# build package from filelist, dlist and binary files in CREW_DEST_DIR
puts "Archiving..."
puts 'Archiving...'
archive_package pwd
end
def archive_package (pwd)
pkg_name = "#{@pkg.name}-#{@pkg.version}-chromeos-#{@device[:architecture]}.tar.xz"
Dir.chdir CREW_DEST_DIR do
if @opt_verbose then
system "tar cJvf #{pwd}/#{pkg_name} *"
else
system "tar cJf #{pwd}/#{pkg_name} *"
end
end
Dir.chdir pwd do
system "sha256sum #{pkg_name} > #{pkg_name}.sha256"
end
system "tar -cJf #{@verbose} #{CREW_DEST_DIR}/#{pwd}/#{pkg_name} *"
system "sha256sum #{pwd}/#{pkg_name} > #{pwd}/#{pkg_name}.sha256"
end
def remove (pkgName)
@@ -947,7 +899,7 @@ def remove (pkgName)
#remove all files installed by the package
File.open("meta/#{pkgName}.filelist").each_line do |line|
begin
puts "Removing file " + line.chomp + "".lightred if @opt_verbose
puts 'Removing file ' + line.chomp + ''.lightred if @opt_verbose
File.unlink line.chomp
rescue => exception #swallow exception
end
@@ -956,7 +908,7 @@ def remove (pkgName)
#remove all directories installed by the package
File.readlines("meta/#{pkgName}.directorylist").reverse.each do |line|
begin
puts "Removing directory " + line.chomp + "".lightred if @opt_verbose
puts 'Removing directory ' + line.chomp + ''.lightred if @opt_verbose
Dir.rmdir line.chomp
rescue => exception #swallow exception
end
@@ -970,7 +922,7 @@ def remove (pkgName)
end
#remove from installed packages
puts "Removing package " + pkgName + "".lightred if @opt_verbose
puts 'Removing package ' + pkgName + "".lightred if @opt_verbose
@device[:installed_packages].each do |elem|
@device[:installed_packages].delete elem if elem[:name] == pkgName
end
@@ -991,7 +943,7 @@ def build_command (args)
args["<name>"].each do |name|
@pkgName = name
search @pkgName
print_current_package
print_current_package @opt_verbose
resolve_dependencies_and_build
end
end
@@ -1000,7 +952,7 @@ def download_command (args)
args["<name>"].each do |name|
@pkgName = name
search @pkgName
print_current_package
print_current_package @opt_verbose
download
end
end
@@ -1037,7 +989,7 @@ def install_command (args)
args["<name>"].each do |name|
@pkgName = name
search @pkgName
print_current_package
print_current_package true
@pkg.build_from_source = true if @opt_src or @opt_recursive
resolve_dependencies_and_install
end
@@ -1122,5 +1074,5 @@ def is_command (name)
end
command_name = args.find { |k, v| v && is_command(k) } [0]
function = command_name + "_command"
function = command_name + '_command'
send(function, args)

2
lib/const.rb
View File

@@ -1,6 +1,6 @@
# Defines common constants used in different parts of crew
CREW_VERSION = '1.5.6'
CREW_VERSION = '1.5.7'
ARCH_ACTUAL = `uname -m`.strip
# This helps with virtualized builds on aarch64 machines