jsdoc3 3.2.1

Also add conflict with jsdoc-toolkit

2 files changed, 6 insertions, 3 deletions

diff --git a/Library/Formula/jsdoc-toolkit.rb b/Library/Formula/jsdoc-toolkit.rb
index d478f743c..0e4cb2ed5 100644
--- a/Library/Formula/jsdoc-toolkit.rb
+++ b/Library/Formula/jsdoc-toolkit.rb
@@ -5,6 +5,8 @@ class JsdocToolkit < Formula
   url 'https://jsdoc-toolkit.googlecode.com/files/jsdoc_toolkit-2.4.0.zip'
   sha1 'bd276ec58dbd419326760226174eba09810d26ee'
 
+  conflicts_with 'jsdoc3', :because => 'both install jsdoc'
+
   def install
     system "/bin/echo '#!/bin/ksh\nJSDOCDIR=\"#{libexec}/jsdoc-toolkit\"' > jsdoc"
     system "/usr/bin/grep -v \"^echo \\$CMD$\" jsdoc-toolkit/jsrun.sh >> jsdoc"
diff --git a/Library/Formula/jsdoc3.rb b/Library/Formula/jsdoc3.rb
index fbad79c2e..de3efeb84 100644
--- a/Library/Formula/jsdoc3.rb
+++ b/Library/Formula/jsdoc3.rb
@@ -2,10 +2,11 @@ require 'formula'
 
 class Jsdoc3 < Formula
   homepage 'http://usejsdoc.org/'
-  url 'https://github.com/jsdoc3/jsdoc/archive/v3.2.1.tar.gz'
-  sha1 '9475bdef742dbdee96e002f000a2d99e05253093'
-
   head 'https://github.com/jsdoc3/jsdoc.git', :branch => 'master'
+  url 'https://github.com/jsdoc3/jsdoc/archive/v3.2.2.tar.gz'
+  sha1 '69d284a65a9b2b06c6e6454acb30976b41dea7b6'
+
+  conflicts_with 'jsdoc-toolkit', :because => 'both install jsdoc'
 
   def install
     libexec.install Dir['*']