Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepend vendor name to disambiguate Casks #3362

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Casks/webpquicklook.rb → Casks/emin-webpquicklook.rb
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
12 changes: 0 additions & 12 deletions Casks/f-lux.rb

This file was deleted.

11 changes: 8 additions & 3 deletions Casks/flux.rb
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion Casks/unison-usenet.rb → Casks/panic-unison.rb
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
7 changes: 7 additions & 0 deletions Casks/the-escapers-flux.rb
Original file line number Diff line number Diff line change
@@ -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