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

Simplify device.json handling in lib/fixup.rb (#12799)

Browse Source 
* Properly interpolate the printed error message when save_json fails

* Fix CREW_ESSENTIAL_PACKAGES being nil on pre glibc standalone i686

* Simplify device.json handling in lib/fixup.rb, removing instance variables and shared state
This commit is contained in:
Maximilian Downey Twiss
2025-09-16 23:08:19 +10:00
committed by GitHub
parent c235ab2220
commit a545db0728
4 changed files with 40 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/crew
View File

@@ -264,6 +264,9 @@ def update
# Do any fixups necessary after crew has updated from git. # Do any fixups necessary after crew has updated from git.
load "#{CREW_LIB_PATH}/lib/fixup.rb" load "#{CREW_LIB_PATH}/lib/fixup.rb"
# Reload device.json in case it was modified by lib/fixup.rb
@device = ConvenienceFunctions.load_symbolized_json
end end
# check for outdated installed packages # check for outdated installed packages

4
lib/const.rb
View File

@@ -4,7 +4,7 @@ require 'etc'
require 'open3' require 'open3'
OLD_CREW_VERSION ||= defined?(CREW_VERSION) ? CREW_VERSION : '1.0' OLD_CREW_VERSION ||= defined?(CREW_VERSION) ? CREW_VERSION : '1.0'
CREW_VERSION ||= '1.66.3' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION CREW_VERSION ||= '1.66.4' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION
# Kernel architecture. # Kernel architecture.
KERN_ARCH ||= Etc.uname[:machine] KERN_ARCH ||= Etc.uname[:machine]
@@ -70,7 +70,7 @@ unless defined?(CREW_ESSENTIAL_PACKAGES)
File.file?(File.join(CREW_PREFIX, "etc/crew/meta/glibc_build#{LIBC_VERSION.delete('.')}.filelist")) ? "glibc_build#{LIBC_VERSION.delete('.')}" : '' File.file?(File.join(CREW_PREFIX, "etc/crew/meta/glibc_build#{LIBC_VERSION.delete('.')}.filelist")) ? "glibc_build#{LIBC_VERSION.delete('.')}" : ''
end end
} }
].reject!(&:empty?) ].reject(&:empty?)
end end
CREW_IN_CONTAINER ||= File.exist?('/.dockerenv') || ENV.fetch('CREW_IN_CONTAINER', false) unless defined?(CREW_IN_CONTAINER) CREW_IN_CONTAINER ||= File.exist?('/.dockerenv') || ENV.fetch('CREW_IN_CONTAINER', false) unless defined?(CREW_IN_CONTAINER)

4
lib/convenience_functions.rb
View File

@@ -77,10 +77,8 @@ class ConvenienceFunctions
crewlog 'Saving device.json...' crewlog 'Saving device.json...'
begin begin
File.write File.join(CREW_CONFIG_PATH, 'device.json.tmp'), JSON.pretty_generate(JSON.parse(json_object.to_json)) File.write File.join(CREW_CONFIG_PATH, 'device.json.tmp'), JSON.pretty_generate(JSON.parse(json_object.to_json))
# rubocop:disable Lint/UselessAssignment
rescue StandardError => e rescue StandardError => e
# rubocop:enable Lint/UselessAssignment puts "Error writing updated packages json file!\n#{e.message}".lightred
puts "Error writing updated packages json file!\n{e.message}".lightred
abort abort
end end

105
lib/fixup.rb
View File

@@ -63,39 +63,6 @@ Dir.chdir CREW_LIB_PATH do
system 'git config --local http.lowSpeedTime 5' if `git config --local http.lowSpeedTime`.empty? system 'git config --local http.lowSpeedTime 5' if `git config --local http.lowSpeedTime`.empty?
end end
@fixup_json = JSON.load_file(File.join(CREW_CONFIG_PATH, 'device.json'))
def keep_keys(arr, keeper_keys)
keepers = keeper_keys.to_set
arr.map { |h| h.slice(*keepers) }
end
# Use @installed_packages.include?(pkg_name) to determine if a package is
# installed.
@installed_packages = keep_keys(@fixup_json['installed_packages'], ['name']).flat_map(&:values).to_set
def save_json(json_object)
crewlog 'Saving device.json...'
begin
File.write File.join(CREW_CONFIG_PATH, 'device.json.tmp'), JSON.pretty_generate(JSON.parse(json_object.to_json))
# rubocop:disable Lint/UselessAssignment
rescue StandardError => e
# rubocop:enable Lint/UselessAssignment
puts "Error writing updated packages json file!\n{e.message}".lightred
abort
end
# Copy over original if the write to the tmp file succeeds.
FileUtils.cp("#{CREW_CONFIG_PATH}/device.json.tmp", File.join(CREW_CONFIG_PATH, 'device.json')) && FileUtils.rm("#{CREW_CONFIG_PATH}/device.json.tmp")
end
def refresh_crew_json
if defined?(@device)
@device = if @device['architecture'].nil?
JSON.parse(@fixup_json.to_json, symbolize_names: true).transform_values! { |val| val.is_a?(String) ? val.to_sym : val }
else
JSON.parse(@fixup_json.to_json)
end
end
end
# Rename the binary_sha256 variable to sha256 in the device.json file # Rename the binary_sha256 variable to sha256 in the device.json file
system("sed -i 's/binary_sha256/sha256/g' #{File.join(CREW_CONFIG_PATH, 'device.json')}") system("sed -i 's/binary_sha256/sha256/g' #{File.join(CREW_CONFIG_PATH, 'device.json')}")
@@ -219,12 +186,17 @@ unless CREW_PRE_GLIBC_STANDALONE
deprecated_packages << { pkg_name: 'glibc_lib237', comments: 'We are moving away from system glibc.' } deprecated_packages << { pkg_name: 'glibc_lib237', comments: 'We are moving away from system glibc.' }
end end
# Load device.json and get an array of the currently installed packages.
device_json = JSON.load_file(File.join(CREW_CONFIG_PATH, 'device.json'))
installed_packages = device_json['installed_packages'].map { it['name'] }
# Handle package renames. # Handle package renames.
renamed_pkgs = renamed_packages.map { |h| h[:pkg_name] } # TODO: This currently does not handle fake packages very well.
installed_pkgs_to_rename = @installed_packages & renamed_pkgs renamed_pkgs = renamed_packages.map { it[:pkg_name] }
installed_pkgs_to_rename = installed_packages & renamed_pkgs
installed_pkgs_to_rename.each do |fixup_pkg| installed_pkgs_to_rename.each do |fixup_pkg|
working_pkg = renamed_packages.find { |i| i[:pkg_name] == fixup_pkg } working_pkg = renamed_packages.find { it[:pkg_name] == fixup_pkg }
pkg_name = working_pkg[:pkg_name] pkg_name = working_pkg[:pkg_name]
pkg_rename = working_pkg[:pkg_rename] pkg_rename = working_pkg[:pkg_rename]
@@ -234,65 +206,59 @@ installed_pkgs_to_rename.each do |fixup_pkg|
new_filelist = File.join(CREW_META_PATH, "#{pkg_rename}.filelist") new_filelist = File.join(CREW_META_PATH, "#{pkg_rename}.filelist")
old_directorylist = File.join(CREW_META_PATH, "#{pkg_name}.directorylist") old_directorylist = File.join(CREW_META_PATH, "#{pkg_name}.directorylist")
new_directorylist = File.join(CREW_META_PATH, "#{pkg_rename}.directorylist") new_directorylist = File.join(CREW_META_PATH, "#{pkg_rename}.directorylist")
# Handle case of new package already installed.
if @installed_packages.include?(pkg_rename) # Handle the case of the new package already being installed.
if installed_packages.include?(pkg_rename)
puts "Renamed #{pkg_rename.capitalize} is already installed. Deleting old package (#{pkg_rename.capitalize}) information...".lightblue puts "Renamed #{pkg_rename.capitalize} is already installed. Deleting old package (#{pkg_rename.capitalize}) information...".lightblue
FileUtils.rm_f [old_filelist, old_directorylist] FileUtils.rm_f [old_filelist, old_directorylist]
@fixup_json['installed_packages'].delete_if { |elem| elem[:name] == pkg_name }
@installed_packages = keep_keys(@fixup_json['installed_packages'], ['name']).flat_map(&:values).to_set device_json['installed_packages'].delete_if { it['name'] == pkg_name }
installed_packages.delete(pkg_name)
next next
end end
# Handle case of package needing to be replaced.
# Handle the case of a package needing to be replaced.
if File.file?(new_filelist) if File.file?(new_filelist)
puts "New filelist for #{pkg_rename.capitalize} already exists!" puts "New filelist for #{pkg_rename.capitalize} already exists!"
next next
end end
if File.file?(new_directorylist) if File.file?(new_directorylist)
puts "New directorylist for #{pkg_rename.capitalize} already exists!" puts "New directorylist for #{pkg_rename.capitalize} already exists!"
next next
end end
# If new filelist or directorylist do not exist and new package is not
# marked as installed in device.json then rename and edit json. # If we are here, rename the filelists and rename the package in device.json
FileUtils.mv old_filelist, new_filelist FileUtils.mv old_filelist, new_filelist
FileUtils.mv old_directorylist, new_directorylist FileUtils.mv old_directorylist, new_directorylist
@fixup_json['installed_packages'].find { |h| h['name'] == pkg_name }
@fixup_json['installed_packages'].find { |h| h['name'] == pkg_name }['name'] = pkg_rename device_json['installed_packages'][installed_packages.index(pkg_name)]['name'] = pkg_rename
installed_packages[installed_packages.index(pkg_name)] = pkg_rename
end end
unless installed_pkgs_to_rename.empty? # Write our changes to device.json now, because Command.remove will load it personally.
@installed_packages = keep_keys(@fixup_json['installed_packages'], ['name']).flat_map(&:values).to_set ConvenienceFunctions.save_json(device_json)
save_json(@fixup_json)
refresh_crew_json
end
# Handle deprecated packages. # Handle deprecated packages.
deprecated_pkgs = deprecated_packages.map { |h| h[:pkg_name] } deprecated_pkgs = deprecated_packages.map { it[:pkg_name] }
installed_pkgs_to_deprecate = @installed_packages & deprecated_pkgs installed_pkgs_to_deprecate = installed_packages & deprecated_pkgs
installed_pkgs_to_deprecate.each do |fixup_pkg| installed_pkgs_to_deprecate.each do |fixup_pkg|
working_pkg = deprecated_packages.find { |i| i[:pkg_name] == fixup_pkg } working_pkg = deprecated_packages.find { it[:pkg_name] == fixup_pkg }
pkg_name = working_pkg[:pkg_name] pkg_name = working_pkg[:pkg_name]
puts "#{pkg_name.capitalize} is deprecated and should be removed. #{working_pkg[:comments]}".lightpurple puts "#{pkg_name.capitalize} is deprecated and should be removed. #{working_pkg[:comments]}".lightpurple
if Package.agree_default_yes("\nWould you like to remove deprecated package #{pkg_name.capitalize}") if Package.agree_default_yes("\nWould you like to remove deprecated package #{pkg_name.capitalize}")
# Create a minimal Package object and pass it to Command.remove # Create a minimal Package object and pass it to Command.remove
pkg_object = Package pkg_object = Package
pkg_object.instance_eval do pkg_object.name = pkg_name
self.name = pkg_name
def self.preremove; end
def self.postremove; end
end
Command.remove(pkg_object, verbose: CREW_VERBOSE)
else
puts "#{pkg_name.capitalize} not removed.".lightblue
end
end
# Reload json after all external fixups are done, as there may have been external changes. Command.remove(pkg_object, verbose: CREW_VERBOSE, force: !CREW_PRE_GLIBC_STANDALONE, only_remove_files: true)
unless installed_pkgs_to_deprecate.empty? else
@fixup_json = JSON.load_file(File.join(CREW_CONFIG_PATH, 'device.json')) puts "#{pkg_name.capitalize} was not removed.".lightblue
@installed_packages = keep_keys(@fixup_json['installed_packages'], ['name']).flat_map(&:values).to_set end
refresh_crew_json
end end
if File.exist?("#{CREW_PREFIX}/bin/upx") && File.exist?("#{CREW_PREFIX}/bin/patchelf") if File.exist?("#{CREW_PREFIX}/bin/upx") && File.exist?("#{CREW_PREFIX}/bin/patchelf")
@@ -317,6 +283,3 @@ if File.exist?("#{CREW_PREFIX}/bin/upx") && File.exist?("#{CREW_PREFIX}/bin/patc
else else
abort 'Please install upx and patchelf first by running \'crew install upx patchelf\'.'.lightred abort 'Please install upx and patchelf first by running \'crew install upx patchelf\'.'.lightred
end end
# Reload @device with the appropriate symbolized or nonsymbolized json load before we exit fixup.
refresh_crew_json