From 0c576a60127cfe6b73d6703ee400210310e9c682 Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Tue, 4 Mar 2014 08:31:37 -0500 Subject: [PATCH 1/4] doc: prepend vendor names to disambiguate note as well that Casks which differ only by placement of hyphens are somewhat ambiguous and to be avoided. --- CONTRIBUTING.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 19e37bb9a5617..7917233c95e2d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -171,6 +171,9 @@ We try to maintain consistent naming so everything stays clean and predictable. * Pay attention to details, for example: `"Git Hub" != "git_hub" != "GitHub"` * If the result of that process is something unhelpful, such as `Macintosh Installer`, then just create the best name you can, based on the author's web page. + * If the result conflicts with the name of an existing Cask, make yours unique + by prepending the name of the vendor or developer, followed by a separator. + Example: [unison.rb](../Casks/unison.rb) and [panic-unison.rb](../Casks/panic-unison.rb). ##### Canonical Names of `pkg`-based Installers @@ -195,7 +198,8 @@ To get from the App's canonical name to the Cask name: * delete a leading hyphen * a leading digit gets spelled out into English: `1password` becomes `onepassword` -Casks are stored in a Ruby file matching their name. +Casks are stored in a Ruby file matching their name. If possible, avoid creating +Cask files which differ only by the placement of hyphens. #### Cask Class From c30161cde98d4edbe6863dfe7035afef3677bdb2 Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Tue, 4 Mar 2014 08:30:17 -0500 Subject: [PATCH 2/4] rename Casks which collide on "flux" by vendor The product from justgetflux.com becomes flux.rb. The current flux.rb is renamed the-escapers-flux.rb. This resolves having two Cask names which differ only by the placement of hyphens. --- Casks/f-lux.rb | 12 ------------ Casks/flux.rb | 11 ++++++++--- Casks/the-escapers-flux.rb | 7 +++++++ 3 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 Casks/f-lux.rb create mode 100644 Casks/the-escapers-flux.rb diff --git a/Casks/f-lux.rb b/Casks/f-lux.rb deleted file mode 100644 index 74f741765507d..0000000000000 --- a/Casks/f-lux.rb +++ /dev/null @@ -1,12 +0,0 @@ -class FLux < Cask - url 'https://justgetflux.com/mac/Flux.zip' - homepage 'http://justgetflux.com' - version 'latest' - no_checksum - link 'Flux.app' - - after_install do - # Don't ask to move the app bundle to /Applications - system '/usr/bin/defaults', 'write', 'org.herf.Flux', 'moveToApplicationsFolderAlertSuppress', '-bool', 'true' - end -end diff --git a/Casks/flux.rb b/Casks/flux.rb index d377b998be620..48b820c85cd95 100644 --- a/Casks/flux.rb +++ b/Casks/flux.rb @@ -1,7 +1,12 @@ class Flux < Cask - url 'http://instruktion.net/theescapers/downloads/FluxV4.zip' - homepage 'http://www.theescapers.com/flux/' - version '4' + url 'https://justgetflux.com/mac/Flux.zip' + homepage 'http://justgetflux.com' + version 'latest' no_checksum link 'Flux.app' + + after_install do + # Don't ask to move the app bundle to /Applications + system '/usr/bin/defaults', 'write', 'org.herf.Flux', 'moveToApplicationsFolderAlertSuppress', '-bool', 'true' + end end diff --git a/Casks/the-escapers-flux.rb b/Casks/the-escapers-flux.rb new file mode 100644 index 0000000000000..3b6c63b78107b --- /dev/null +++ b/Casks/the-escapers-flux.rb @@ -0,0 +1,7 @@ +class TheEscapersFlux < Cask + url 'http://instruktion.net/theescapers/downloads/FluxV4.zip' + homepage 'http://www.theescapers.com/flux/' + version '4' + no_checksum + link 'Flux.app' +end From 8b84dbaae5b2a56bf092dcd9ab4c95172ae9ce12 Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Tue, 4 Mar 2014 08:33:19 -0500 Subject: [PATCH 3/4] rename Casks which collide on "unison" by vendor `unison-usenet.rb` becomes `panic-unison.rb` --- Casks/{unison-usenet.rb => panic-unison.rb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename Casks/{unison-usenet.rb => panic-unison.rb} (89%) diff --git a/Casks/unison-usenet.rb b/Casks/panic-unison.rb similarity index 89% rename from Casks/unison-usenet.rb rename to Casks/panic-unison.rb index 395f2fecb99b3..633f3b2f12c13 100644 --- a/Casks/unison-usenet.rb +++ b/Casks/panic-unison.rb @@ -1,4 +1,4 @@ -class UnisonUsenet < Cask +class PanicUnison < Cask url 'http://download.panic.com/Unison/Unison%202.1.10.zip' homepage 'http://panic.com/unison/' version '2.1.10' From dceb4bf0ed5a248fddc8e46cb479d7030495f8cd Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Tue, 4 Mar 2014 08:36:23 -0500 Subject: [PATCH 4/4] rename Casks which collide on "webpquicklook" disambiguate by vendor/developer --- Casks/{webpquicklook.rb => emin-webpquicklook.rb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename Casks/{webpquicklook.rb => emin-webpquicklook.rb} (86%) diff --git a/Casks/webpquicklook.rb b/Casks/emin-webpquicklook.rb similarity index 86% rename from Casks/webpquicklook.rb rename to Casks/emin-webpquicklook.rb index a8af882c787d5..94e5e349350b1 100644 --- a/Casks/webpquicklook.rb +++ b/Casks/emin-webpquicklook.rb @@ -1,4 +1,4 @@ -class Webpquicklook < Cask +class EminWebpquicklook < Cask url 'https://raw.github.com/emin/WebPQuickLook/master/WebpQuickLook.tar.gz' homepage 'https://github.com/emin/WebPQuickLook' version 'latest'