Commit b362c08d authored by Ed Reel's avatar Ed Reel Committed by GitHub

Revert crew executable location but keep all other changes (#5604)

parent ff31a818
#!/usr/bin/env ruby #!/usr/bin/env ruby
require_relative '../lib/color' require_relative 'lib/color'
# Disallow sudo # 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
...@@ -10,8 +10,8 @@ require 'uri' ...@@ -10,8 +10,8 @@ require 'uri'
require 'digest/sha2' require 'digest/sha2'
require 'json' require 'json'
require 'fileutils' require 'fileutils'
require_relative '../lib/const' require_relative 'lib/const'
require_relative '../lib/util' require_relative 'lib/util'
# Add lib to LOAD_PATH # Add lib to LOAD_PATH
$LOAD_PATH.unshift "#{CREW_LIB_PATH}lib" $LOAD_PATH.unshift "#{CREW_LIB_PATH}lib"
...@@ -72,7 +72,7 @@ ENV["XZ_OPT"] = ENV['CREW_XZ_OPT'] || "-7e -T #{CREW_NPROC}" ...@@ -72,7 +72,7 @@ ENV["XZ_OPT"] = ENV['CREW_XZ_OPT'] || "-7e -T #{CREW_NPROC}"
CURL = ENV['CURL'] || 'curl' CURL = ENV['CURL'] || 'curl'
# Parse arguments using docopt # Parse arguments using docopt
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>'] args['<name>'] = args['<name>'].map { |arg| arg.gsub('-','_') } if args['<name>']
......
...@@ -187,7 +187,7 @@ done ...@@ -187,7 +187,7 @@ done
sudo ldconfig &> /dev/null || true sudo ldconfig &> /dev/null || true
# create symlink to 'crew' in ${CREW_PREFIX}/bin/ # create symlink to 'crew' in ${CREW_PREFIX}/bin/
ln -sfv "../lib/crew/bin/crew" "${CREW_PREFIX}/bin/" ln -sfv "lib/crew/crew" "${CREW_PREFIX}/bin/"
# prepare sparse checkout .rb packages directory and do it # prepare sparse checkout .rb packages directory and do it
cd "${CREW_LIB_PATH}" cd "${CREW_LIB_PATH}"
......
# Defines common constants used in different parts of crew # Defines common constants used in different parts of crew
CREW_VERSION = '1.8.0' CREW_VERSION = '1.8.1'
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