diff options
| author | Mike McQuaid | 2018-02-21 09:48:36 +0000 |
|---|---|---|
| committer | GitHub | 2018-02-21 09:48:36 +0000 |
| commit | 09c5be86b615de6ed36bb2163eb98a0cb3c7cb43 (patch) | |
| tree | 41051c1e0a8f6ae52e4ce74f3fcae582ed908941 | |
| parent | 77e2478555b4f8d143f98907ed1f55f71b7a6af7 (diff) | |
| parent | 157f84a74d4274f1fcfc73eda94a819cb68df944 (diff) | |
| download | brew-09c5be86b615de6ed36bb2163eb98a0cb3c7cb43.tar.bz2 | |
Merge pull request #3820 from sjackman/macos-version
Define OS::Mac on Linux
| -rw-r--r-- | .travis.yml | 13 | ||||
| -rw-r--r-- | Library/Homebrew/os.rb | 1 | ||||
| -rw-r--r-- | Library/Homebrew/os/linux.rb | 28 |
3 files changed, 31 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index fd43e3942..37417a10a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,22 +36,13 @@ before_install: mv "$HOMEBREW_REPOSITORY/Library/Taps" "$PWD/Library"; sudo rm -rf "$HOMEBREW_REPOSITORY"; sudo ln -s "$PWD" "$HOMEBREW_REPOSITORY"; - else - HOMEBREW_CORE_TAP_DIR="$(brew --repo "homebrew/core")"; - mkdir -p "$HOMEBREW_CORE_TAP_DIR"; fi - if [ "$MACOS" ]; then travis_retry git -C Library/Taps/homebrew/homebrew-core fetch --depth=1 origin; + else + travis_retry git clone --depth=1 https://github.com/Homebrew/homebrew-core Library/Taps/homebrew/homebrew-core; fi - travis_retry git clone --depth=1 https://github.com/Homebrew/homebrew-test-bot Library/Taps/homebrew/homebrew-test-bot - - if [ "$LINUX" ]; then - HOMEBREW_TEST_BOT_TAP_DIR="$(brew --repo "homebrew/test-bot")"; - ln -s "$HOMEBREW_TEST_BOT_TAP_DIR/.git" "$HOMEBREW_TEST_BOT_TAP_DIR/Formula" "$HOMEBREW_CORE_TAP_DIR"; - fi - # can be removed after 1.5.3 is tagged - - if [ "$LINUX" ]; then - export HOMEBREW_FORCE_VENDOR_RUBY=1; - fi script: - brew test-bot diff --git a/Library/Homebrew/os.rb b/Library/Homebrew/os.rb index d35a49dd7..d56b03228 100644 --- a/Library/Homebrew/os.rb +++ b/Library/Homebrew/os.rb @@ -21,6 +21,7 @@ module OS end PATH_OPEN = "/usr/bin/open".freeze elsif OS.linux? + require "os/linux" ISSUES_URL = "https://github.com/Linuxbrew/brew/wiki/troubleshooting".freeze PATH_OPEN = "xdg-open".freeze end diff --git a/Library/Homebrew/os/linux.rb b/Library/Homebrew/os/linux.rb new file mode 100644 index 000000000..e5af301b2 --- /dev/null +++ b/Library/Homebrew/os/linux.rb @@ -0,0 +1,28 @@ +module OS + # Define OS::Mac on Linux for formula API compatibility. + module Mac + module_function + + ::MacOS = self # rubocop:disable Naming/ConstantName + + def prefer_64_bit? + Hardware::CPU.is_64_bit? + end + + def version + Version::NULL + end + + def full_version + Version::NULL + end + + module Xcode + module_function + + def version + Version::NULL + end + end + end +end |