Merge branch 'strip_launcher_from_names' of https://github.com/roland…

…walker/homebrew-cask into rolandwalker-strip_launcher_from_names Conflicts: Casks/googleappengine.rb doc/CASK_NAMING_REFERENCE.md
namesco · Jan 29, 2015 · 83c7127 · 83c7127
2 parents 5d194ba + 06fe09d
commit 83c7127
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Casks/googleappenginelauncher.rb → Casks/googleappengine.rb b/Casks/googleappenginelauncher.rb → Casks/googleappengine.rb
@@ -1,4 +1,4 @@
-cask :v1 => 'googleappenginelauncher' do
+cask :v1 => 'googleappengine' do
   version '1.9.17'
   sha256 '4af24bd90f0dce1c754b30edcaec72e407c13416ee3a4234f5ca1f68b61e8cbf'
 

diff --git a/developer/bin/generate_cask_token b/developer/bin/generate_cask_token
@@ -76,8 +76,7 @@ REMOVE_TRAILING_PATS = [
 
                         # generic terms
                         %r{\bapp}i,
-                        # idea, but never discussed
-                        # %r{\blauncher}i,
+                        %r{\b(?:quick[\s-]*)?launcher}i,
 
                         # "mac", "for mac", "for OS X".
                         %r{\b(?:for)?[\s-]*mac(?:intosh)?}i,

diff --git a/doc/cask_token_reference.md b/doc/cask_token_reference.md
@@ -54,6 +54,8 @@ distribution, use the [`name`](CASK_LANGUAGE_REFERENCE.md#name-stanza-details) w
   * If the version number is arranged to occur in the middle of the App name,
     it should also be removed.  Example: [IntelliJ IDEA 13 CE.app](../Casks/intellij-idea-ce.rb).
 
+  * Remove from the end: "Launcher", "Quick Launcher".
+
   * Remove from the end: strings such as "Mac", "for Mac", "for OS X".
     These terms are generally added to ported software such as "MAME OS X.app".
     Exception: when the software is not a port, and "Mac" is an inseparable