mirror of
https://github.com/chromebrew/chromebrew.git
synced 2026-01-08 23:18:10 -05:00
Do not require env variables when outside chromebrew. (#12793)
* adjust logic Signed-off-by: Satadru Pramanik <satadru@gmail.com> * bump version Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Remove unnecessary instance variables. Signed-off-by: Satadru Pramanik <satadru@gmail.com> --------- Signed-off-by: Satadru Pramanik <satadru@gmail.com>
This commit is contained in:
committed by
GitHub
parent
a5c2bf1d2a
commit
c235ab2220
@@ -4,7 +4,7 @@ require 'etc'
|
||||
require 'open3'
|
||||
|
||||
OLD_CREW_VERSION ||= defined?(CREW_VERSION) ? CREW_VERSION : '1.0'
|
||||
CREW_VERSION ||= '1.66.2' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION
|
||||
CREW_VERSION ||= '1.66.3' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION
|
||||
|
||||
# Kernel architecture.
|
||||
KERN_ARCH ||= Etc.uname[:machine]
|
||||
@@ -104,9 +104,12 @@ CREW_LIB_PREFIX ||= File.join(CREW_PREFIX, ARCH_LIB)
|
||||
CREW_MAN_PREFIX ||= File.join(CREW_PREFIX, 'share/man')
|
||||
CREW_LIB_PATH ||= Dir.exist?(File.join(CREW_PREFIX, 'lib/crew')) ? File.join(CREW_PREFIX, 'lib/crew') : CREW_LOCAL_REPO_ROOT
|
||||
CREW_PACKAGES_PATH ||= File.join(CREW_LIB_PATH, 'packages')
|
||||
CREW_CONFIG_PATH ||= ENV.fetch('CREW_CONFIG_PATH', File.join(CREW_PREFIX, 'etc/crew')) unless defined?(CREW_CONFIG_PATH)
|
||||
|
||||
crew_config_path = File.join(CREW_PREFIX, 'etc/crew')
|
||||
CREW_CONFIG_PATH ||= (Dir.exist?(crew_config_path) && File.writable?(crew_config_path) ? crew_config_path : ENV.fetch('CREW_CONFIG_PATH', File.join('/tmp', 'etc/crew'))) unless defined?(CREW_CONFIG_PATH)
|
||||
CREW_META_PATH ||= File.join(CREW_CONFIG_PATH, 'meta')
|
||||
CREW_BREW_DIR ||= ENV.fetch('CREW_BREW_DIR', File.join(CREW_PREFIX, 'tmp/crew')) unless defined?(CREW_BREW_DIR)
|
||||
crew_brew_dir = File.join(CREW_PREFIX, 'tmp/crew')
|
||||
CREW_BREW_DIR ||= (Dir.exist?(crew_brew_dir) && File.writable?(crew_brew_dir) ? crew_brew_dir : ENV.fetch('CREW_BREW_DIR', File.join('/tmp', 'crew'))) unless defined?(CREW_BREW_DIR)
|
||||
CREW_DEST_DIR ||= File.join(CREW_BREW_DIR, 'dest')
|
||||
CREW_DEST_PREFIX ||= File.join(CREW_DEST_DIR, CREW_PREFIX)
|
||||
CREW_DEST_LIB_PREFIX ||= File.join(CREW_DEST_DIR, CREW_LIB_PREFIX)
|
||||
|
||||
Reference in New Issue
Block a user