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

Fix build errors (#6540)

Browse Source
This commit is contained in:
Satadru Pramanik
2021-12-29 23:22:04 -05:00
committed by GitHub
parent 72c2d791b9
commit ce35b43ae5
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/package.rb
View File

@@ -156,15 +156,6 @@ class Package
# extract command arguments
cmd_args = args.select {|arg| arg.is_a?(String) } .join(' ')
# extract env variables (if provided)
env_options = if args[0].is_a?(Hash)
# merge CREW_ENV_OPTIONS and given env variables
CREW_ENV_OPTIONS.scan(/\b(.+?)=(.+)\b/).to_h.merge(args[0])
else
# return CREW_ENV_OPTIONS in hash
CREW_ENV_OPTIONS.scan(/\b(.+?)=(.+)\b/).to_h
end
# extract Kernel.system options (if provided)
system_options = if args[-1].is_a?(Hash)
@@ -178,15 +169,14 @@ class Package
begin
# use bash instead of /bin/sh
Kernel.system env_options,
'bash', '-e', '-c',
cmd_args, # ensure the command is passed first
system_options # pass Kernel.system options (all args after command) then
@system_args = ''
[@system_args, "bash -e -c \"#{cmd_args}\""].reduce(&:concat)
Kernel.system(@system_args, system_options)
rescue => e
exitstatus = $?.exitstatus
# print failed line number and error message
puts "#{e.backtrace[1]}: #{e.message}".orange
raise InstallError.new("`#{cmd_args.join(' ')}` exited with #{exitstatus}")
raise InstallError, "`#{cmd_args}` exited with #{exitstatus}"
end
end
end