From 5114ab8409cd831d88e1d3250b2d8a740f8ae0e0 Mon Sep 17 00:00:00 2001 From: Adam Vandenberg Date: Sat, 19 Jan 2013 16:22:06 -0800 Subject: apktool: hide aapt appt conflicts with the android-sdk Closes #16872. --- Library/Formula/apktool.rb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'Library/Formula') diff --git a/Library/Formula/apktool.rb b/Library/Formula/apktool.rb index 2ec4cdf57..cda900c5f 100644 --- a/Library/Formula/apktool.rb +++ b/Library/Formula/apktool.rb @@ -14,9 +14,15 @@ class Apktool < Formula libexec.install 'apktool.jar' ApktoolExecutables.new.brew do |f| - # Make apktool look for jar in libexec - inreplace 'apktool', /^libdir=.*$/, "libdir=\"#{libexec}\"" - bin.install 'aapt', 'apktool' + libexec.install 'aapt', 'apktool' end + + # Make apktool look for jar and aapkt in libexec + inreplace "#{libexec}/apktool" do |s| + s.gsub! /^libdir=.*$/, "libdir=\"#{libexec}\"" + s.gsub! "PATH=$PATH:`pwd`;", "PATH=$PATH:#{libexec};" + end + + bin.install_symlink libexec/'apktool' end end -- cgit v1.2.3