From 7bae04d6751e4168bf88477f73632dd36b9d6213 Mon Sep 17 00:00:00 2001
From: Xu Cheng
Date: Thu, 18 Dec 2014 15:13:04 +0800
Subject: (un)linkapps: allow unlink/link specific formulae.

Closes #35080.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
---
 Library/Homebrew/cmd/linkapps.rb   | 17 ++++++++++++-----
 Library/Homebrew/cmd/unlinkapps.rb | 22 ++++++++++++++--------
 2 files changed, 26 insertions(+), 13 deletions(-)

(limited to 'Library/Homebrew/cmd')

diff --git a/Library/Homebrew/cmd/linkapps.rb b/Library/Homebrew/cmd/linkapps.rb
index 50df5daa2..7e8430c75 100644
--- a/Library/Homebrew/cmd/linkapps.rb
+++ b/Library/Homebrew/cmd/linkapps.rb
@@ -11,12 +11,19 @@ module Homebrew
       exit 1
     end
 
-    HOMEBREW_CELLAR.subdirs.each do |rack|
-      kegs = rack.subdirs.map { |d| Keg.new(d) }
-      next if kegs.empty?
-
-      keg = kegs.detect(&:linked?) || kegs.max {|a,b| a.version <=> b.version}
+    if ARGV.named.empty?
+      racks = HOMEBREW_CELLAR.subdirs
+      kegs = racks.map do |rack|
+        keg = rack.subdirs.map { |d| Keg.new(d) }
+        next if keg.empty?
+        keg.detect(&:linked?) || keg.max {|a,b| a.version <=> b.version}
+      end
+    else
+      kegs = ARGV.kegs
+    end
 
+    kegs.each do |keg|
+      keg = keg.opt_record if keg.optlinked?
       Dir["#{keg}/*.app", "#{keg}/bin/*.app", "#{keg}/libexec/*.app"].each do |app|
         puts "Linking #{app}"
         app_name = File.basename(app)
diff --git a/Library/Homebrew/cmd/unlinkapps.rb b/Library/Homebrew/cmd/unlinkapps.rb
index 864e33b27..ef11db602 100644
--- a/Library/Homebrew/cmd/unlinkapps.rb
+++ b/Library/Homebrew/cmd/unlinkapps.rb
@@ -5,15 +5,11 @@ module Homebrew
   def unlinkapps
     target_dir = ARGV.include?("--local") ? File.expand_path("~/Applications") : "/Applications"
 
-    unless File.exist? target_dir
-      opoo "#{target_dir} does not exist, stopping."
-      puts "Run `mkdir #{target_dir}` first."
-      exit 1
-    end
+    return unless File.exist? target_dir
 
-    cellar_apps = Dir[target_dir + '/*.app'].select do |app|
-      if File.symlink?(app) && File.readlink(app).match(HOMEBREW_CELLAR)
-        File.readlink app
+    cellar_apps = Dir[target_dir + "/*.app"].select do |app|
+      if File.symlink?(app)
+        should_unlink? File.readlink(app)
       end
     end
 
@@ -24,4 +20,14 @@ module Homebrew
 
     puts "Finished unlinking from #{target_dir}" if cellar_apps
   end
+
+  private
+
+  def should_unlink? file
+    if ARGV.named.empty?
+      file.match(HOMEBREW_CELLAR) || file.match("#{HOMEBREW_PREFIX}/opt")
+    else
+      ARGV.kegs.any? { |keg| file.match(keg.to_s) || file.match(keg.opt_record.to_s) }
+    end
+  end
 end
-- 
cgit v1.2.3