aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/cmd
diff options
context:
space:
mode:
authorXu Cheng2015-07-21 14:47:37 +0800
committerXu Cheng2015-07-22 15:12:15 +0800
commit8cebb64eec8e887b35d53fa3003c87dc1ed5eda1 (patch)
tree5362ac0a04b9023072feee6ae6a8055550117ee7 /Library/Homebrew/cmd
parent895983fed560a05f7080b8c0cfcb1bf19635fcc9 (diff)
downloadbrew-8cebb64eec8e887b35d53fa3003c87dc1ed5eda1.tar.bz2
auto disable sandbox for interactive shell
Closes Homebrew/homebrew#38792. Signed-off-by: Xu Cheng <xucheng@me.com>
Diffstat (limited to 'Library/Homebrew/cmd')
-rw-r--r--Library/Homebrew/cmd/postinstall.rb6
-rw-r--r--Library/Homebrew/cmd/test.rb6
2 files changed, 10 insertions, 2 deletions
diff --git a/Library/Homebrew/cmd/postinstall.rb b/Library/Homebrew/cmd/postinstall.rb
index 1936f25ea..337fc62be 100644
--- a/Library/Homebrew/cmd/postinstall.rb
+++ b/Library/Homebrew/cmd/postinstall.rb
@@ -15,8 +15,12 @@ module Homebrew
#{formula.path}
].concat(ARGV.options_only)
+ if Sandbox.available? && ARGV.sandbox? && Sandbox.auto_disable?
+ Sandbox.print_autodisable_warning
+ end
+
Utils.safe_fork do
- if Sandbox.available? && ARGV.sandbox?
+ if Sandbox.available? && ARGV.sandbox? && !Sandbox.auto_disable?
sandbox = Sandbox.new
formula.logs.mkpath
sandbox.record_log(formula.logs/"sandbox.postinstall.log")
diff --git a/Library/Homebrew/cmd/test.rb b/Library/Homebrew/cmd/test.rb
index 2bc0107cb..d298452ff 100644
--- a/Library/Homebrew/cmd/test.rb
+++ b/Library/Homebrew/cmd/test.rb
@@ -35,8 +35,12 @@ module Homebrew
#{f.path}
].concat(ARGV.options_only)
+ if Sandbox.available? && ARGV.sandbox? && Sandbox.auto_disable?
+ Sandbox.print_autodisable_warning
+ end
+
Utils.safe_fork do
- if Sandbox.available? && ARGV.sandbox?
+ if Sandbox.available? && ARGV.sandbox? && !Sandbox.auto_disable?
sandbox = Sandbox.new
f.logs.mkpath
sandbox.record_log(f.logs/"sandbox.test.log")