diff --git a/Changelog.md b/Changelog.md index d45ab4176..5f6e15abd 100644 --- a/Changelog.md +++ b/Changelog.md @@ -16,6 +16,7 @@ ## Refactor ## Bug fixes +* Add compatibility with macOS to `script/configure_bundler` [#7830](https://github.com/diaspora/diaspora/pull/7830) ## Features diff --git a/script/configure_bundler b/script/configure_bundler index 67e6aa055..06ab723aa 100755 --- a/script/configure_bundler +++ b/script/configure_bundler @@ -2,6 +2,7 @@ # frozen_string_literal: true require_relative "../config/bundler_helper" +require "etc" rails_env = BundlerHelper.rails_env database = BundlerHelper.database @@ -13,7 +14,7 @@ def config(option) system("#{File.join(__dir__, '../bin/bundle')} config --local #{option}") end -config("jobs #{`nproc`}") +config("jobs #{Etc.nprocessors}") config("with #{database}") if rails_env == "production"