From db946b93baed5ffc060be1c8fbb2bbba501cdaf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Galv=C3=A3o?= Date: Sat, 11 Jun 2016 15:03:10 +0100 Subject: [PATCH 1/2] core: change default Caskroom location to be inside brew --repository --- lib/hbc.rb | 4 ++-- lib/hbc/locations.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/hbc.rb b/lib/hbc.rb index 7dee87b3a5fe..210610d06d84 100644 --- a/lib/hbc.rb +++ b/lib/hbc.rb @@ -54,12 +54,12 @@ def self.init HOMEBREW_CACHE.mkpath unless HOMEBREW_CACHE.exist? HOMEBREW_CACHE_CASKS.mkpath unless HOMEBREW_CACHE_CASKS.exist? unless caskroom.exist? - ohai "We need to make Caskroom for the first time at #{caskroom}" - ohai "We'll set permissions properly so we won't need sudo in the future" + ohai "Creating Caskroom at #{caskroom}" current_user = Hbc::Utils.current_user if caskroom.parent.writable? system '/bin/mkdir', '--', caskroom else + ohai "We'll set permissions properly so we won't need sudo in the future" toplevel_dir = caskroom toplevel_dir = toplevel_dir.parent until toplevel_dir.parent.root? unless toplevel_dir.directory? diff --git a/lib/hbc/locations.rb b/lib/hbc/locations.rb index 9734af76bcab..1b40c90711a0 100644 --- a/lib/hbc/locations.rb +++ b/lib/hbc/locations.rb @@ -5,7 +5,7 @@ def self.included(base) module ClassMethods def caskroom - @@caskroom ||= Pathname('/opt/homebrew-cask/Caskroom') + @@caskroom ||= homebrew_repository.join('Caskroom') end def caskroom=(caskroom) From cefd95d772c14e92921d81d63d4f5a70f30a60cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Galv=C3=A3o?= Date: Sat, 11 Jun 2016 15:13:16 +0100 Subject: [PATCH 2/2] docs: change default Caskroom location to be inside brew --repository --- README.md | 2 +- doc/cask_language_reference/stanzas/app.md | 4 ++-- doc/cask_language_reference/stanzas/caveats.md | 6 +++--- doc/man_page/brew-cask.1.md | 8 ++++---- man/man1/brew-cask.1 | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 377024bab20e..0e8480b31dba 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ To start using Homebrew-Cask, you just need [Homebrew](http://brew.sh/) installe $ brew cask install google-chrome ==> Downloading https://dl.google.com/chrome/mac/stable/GGRO/googlechrome.dmg ==> Moving App 'Google Chrome.app' to '/Applications/Google Chrome.app' -🍺 google-chrome staged at '/opt/homebrew-cask/Caskroom/google-chrome/latest' (3 files, 288K) +🍺 google-chrome staged at '/usr/local/Caskroom/google-chrome/latest' (3 files, 288K) ``` And there we have it. Google Chrome installed with a few quick commands: no clicking, no dragging, no dropping. diff --git a/doc/cask_language_reference/stanzas/app.md b/doc/cask_language_reference/stanzas/app.md index aa17b475344d..8a0d50b7b47b 100644 --- a/doc/cask_language_reference/stanzas/app.md +++ b/doc/cask_language_reference/stanzas/app.md @@ -9,13 +9,13 @@ app 'Alfred 2.app' moves the source to: ```bash -~/Applications/Alfred 2.app +/Applications/Alfred 2.app ``` from a source file such as: ```bash -/opt/homebrew-cask/Caskroom/alfred/2.8.2_431/Alfred 2.app +/usr/local/Caskroom/alfred/2.8.2_431/Alfred 2.app ``` ## Renaming the Target diff --git a/doc/cask_language_reference/stanzas/caveats.md b/doc/cask_language_reference/stanzas/caveats.md index 10c49f572f4b..852a29f8da7e 100644 --- a/doc/cask_language_reference/stanzas/caveats.md +++ b/doc/cask_language_reference/stanzas/caveats.md @@ -9,8 +9,8 @@ When `caveats` is a string, it is evaluated at compile time. The following metho | `token` | the Cask token | `version` | the Cask version | `homepage` | the Cask homepage -| `caskroom_path` | the containing directory for all staged Casks, typically `/opt/homebrew-cask/Caskroom` (only available with block form) -| `staged_path` | the staged location for this Cask, including version number, *eg* `/opt/homebrew-cask/Caskroom/adium/1.5.10` (only available with block form) +| `caskroom_path` | the containing directory for all staged Casks, typically `/usr/local/Caskroom` (only available with block form) +| `staged_path` | the staged location for this Cask, including version number, *eg* `/usr/local/Caskroom/adium/1.5.10` (only available with block form) Example: @@ -45,4 +45,4 @@ Example: caveats do path_environment_variable '/usr/texbin' end -``` \ No newline at end of file +``` diff --git a/doc/man_page/brew-cask.1.md b/doc/man_page/brew-cask.1.md index 9913c5810520..74510fff5c7e 100644 --- a/doc/man_page/brew-cask.1.md +++ b/doc/man_page/brew-cask.1.md @@ -105,8 +105,8 @@ names, and other aspects of this manual are still subject to change. the `uninstall` instructions from *newest* Cask definition, even if the given Cask has changed since you installed it. The result is that `uninstall --force` will always succeed in removing relevant files - under `/opt/homebrew-cask`, but will sometimes fail to remove relevant - installed files outside of `/opt/homebrew-cask`. This issue is being + under ``, but will sometimes fail to remove relevant + installed files outside of it. This issue is being addressed. `uninstall` without `--force` is also imperfect. It may be unable to @@ -123,7 +123,7 @@ names, and other aspects of this manual are still subject to change. the Cask does not appear to be currently installed. Removes all staged versions of the Cask distribution found under - `/opt/homebrew-cask/Caskroom/`. + `/`. If the Cask definition contains a `zap` stanza, performs additional `zap` actions as defined there, such as removing local preference @@ -147,7 +147,7 @@ in a future version. Skip Cask dependencies when installing. * `--caskroom=`: - Location of the Caskroom, where all binaries are stored. The default value is: `/opt/homebrew-cask/Caskroom`. + Location of the Caskroom, where all binaries are stored. The default value is: `$(brew --repository)/Caskroom`. * `--verbose`: Give additional feedback during installation. diff --git a/man/man1/brew-cask.1 b/man/man1/brew-cask.1 index 203f92d19c9e..3ba6e2fd7f77 100644 --- a/man/man1/brew-cask.1 +++ b/man/man1/brew-cask.1 @@ -104,7 +104,7 @@ Check the given Casks for correct style using RuboCop Cask \fIhttps://github\.co Uninstall the given Cask\. With \fB\-\-force\fR, uninstall even if the Cask does not appear to be present\. . .IP -Note that \fBuninstall \-\-force\fR is currently imperfect\. It will follow the \fBuninstall\fR instructions from \fInewest\fR Cask definition, even if the given Cask has changed since you installed it\. The result is that \fBuninstall \-\-force\fR will always succeed in removing relevant files under \fB/opt/homebrew\-cask\fR, but will sometimes fail to remove relevant installed files outside of \fB/opt/homebrew\-cask\fR\. This issue is being addressed\. +Note that \fBuninstall \-\-force\fR is currently imperfect\. It will follow the \fBuninstall\fR instructions from \fInewest\fR Cask definition, even if the given Cask has changed since you installed it\. The result is that \fBuninstall \-\-force\fR will always succeed in removing relevant files under \fB\fR, but will sometimes fail to remove relevant installed files outside of it\. This issue is being addressed\. . .IP \fBuninstall\fR without \fB\-\-force\fR is also imperfect\. It may be unable to perform an \fBuninstall\fR operation if the given Cask has changed since you installed it\. This issue is being addressed\. @@ -121,7 +121,7 @@ Unconditionally remove \fIall\fR files associated with the given Cask\. Implicitly performs all actions associated with \fBuninstall\fR, even if the Cask does not appear to be currently installed\. . .IP -Removes all staged versions of the Cask distribution found under \fB/opt/homebrew\-cask/Caskroom/\fR\. +Removes all staged versions of the Cask distribution found under \fB/\fR\. . .IP If the Cask definition contains a \fBzap\fR stanza, performs additional \fBzap\fR actions as defined there, such as removing local preference files\. \fBzap\fR actions are variable, depending on the level of detail defined by the Cask author\. @@ -145,7 +145,7 @@ Skip Cask dependencies when installing\. . .TP \fB\-\-caskroom=\fR -Location of the Caskroom, where all binaries are stored\. The default value is: \fB/opt/homebrew\-cask/Caskroom\fR\. +Location of the Caskroom, where all binaries are stored\. The default value is: \fB$(brew \-\-repository)/Caskroom\fR\. . .TP \fB\-\-verbose\fR