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

Adjust builds to get path after dependency install, and lint crew. (#11788)

Browse Source 
Signed-off-by: Satadru Pramanik <satadru@gmail.com>
Co-authored-by: Satadru Pramanik <satadru@gmail.com>
This commit is contained in:
github-actions[bot]
2025-04-20 19:32:45 -05:00
committed by GitHub
parent b14bd12602
commit 249de3d812
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
bin/crew
View File

@@ -805,8 +805,8 @@ def prepare_package(destdir)
@pkg.postbuild
# create file list
filelist = Dir[".{#{CREW_PREFIX},#{HOME}}/**/{*,.?*}"].filter_map { |e| (File.file?(e) || File.symlink?(e)) ? e[1..] : nil } .sort
File.write('filelist', filelist.join("\n") + "\n")
filelist = Dir[".{#{CREW_PREFIX},#{HOME}}/**/{*,.?*}"].filter_map { |e| File.file?(e) || File.symlink?(e) ? e[1..] : nil }.sort
File.write('filelist', "#{filelist.join("\n")}\n")
if Dir.exist?("#{CREW_LOCAL_REPO_ROOT}/manifest") && File.writable?("#{CREW_LOCAL_REPO_ROOT}/manifest")
FileUtils.mkdir_p "#{CREW_LOCAL_REPO_ROOT}/manifest/#{ARCH}/#{@pkg.name.chr.downcase}"
@@ -859,8 +859,8 @@ def prepare_package(destdir)
system "#{CREW_LIB_PATH}/tools/getrealdeps.rb --use-crew-dest-dir #{@pkg.name}", exception: true if File.which('gawk') && File.which('upx') && !@pkg.no_compile_needed?
# create directory list
directorylist = Dir[".{#{CREW_PREFIX},#{HOME}}/**/{*,.?*}/"].map { |dir| dir[1..] } .sort
File.write('dlist', directorylist.join("\n") + "\n")
directorylist = Dir[".{#{CREW_PREFIX},#{HOME}}/**/{*,.?*}/"].map { |dir| dir[1..] }.sort
File.write('dlist', "#{directorylist.join("\n")}\n")
strip_dir destdir
@@ -1357,6 +1357,17 @@ def build_package(crew_archive_dest)
meta = download
target_dir = unpack meta
# Source ~/.bashrc before every build, and set PATH.
# From https://stackoverflow.com/a/12303443
env = `bash -c ". ~/.bashrc && env"`
env.split("\n").each do |line|
key, value = line.split('=', 2)
if key == 'PATH'
ENV[key] = value
else
ENV[key] ||= value unless value.nil? || value.empty?
end
end
# Build from source and place binaries in CREW_DEST_DIR.
build_and_preconfigure target_dir

2
lib/const.rb
View File

@@ -3,7 +3,7 @@
require 'etc'
OLD_CREW_VERSION ||= defined?(CREW_VERSION) ? CREW_VERSION : '1.0'
CREW_VERSION ||= '1.58.5' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION
CREW_VERSION ||= '1.58.6' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION
# Kernel architecture.
KERN_ARCH ||= Etc.uname[:machine]