Skip to content

Commit

Permalink
Replace UI uses of 'folder' with 'directory'
Browse files Browse the repository at this point in the history
There are still methods and variables with the word "folder" in the
name, but at least user-facing messages and warnings should use the
correct terminology.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
  • Loading branch information
jacknagel committed Feb 25, 2012
1 parent 2c1a2b5 commit 44e13df
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 19 deletions.
2 changes: 1 addition & 1 deletion Library/Homebrew/build.rb
Expand Up @@ -62,7 +62,7 @@ def install f
if ARGV.flag? '--git' if ARGV.flag? '--git'
system "git init" system "git init"
system "git add -A" system "git add -A"
puts "This folder is now a git repo. Make your changes and then use:" puts "This directory is now a git repo. Make your changes and then use:"
puts " git diff | pbcopy" puts " git diff | pbcopy"
puts "to copy the diff to the clipboard." puts "to copy the diff to the clipboard."
end end
Expand Down
35 changes: 19 additions & 16 deletions Library/Homebrew/cmd/doctor.rb
Expand Up @@ -243,10 +243,10 @@ def __check_subdir_access base
cant_read.sort! cant_read.sort!
if cant_read.length > 0 if cant_read.length > 0
puts <<-EOS.undent puts <<-EOS.undent
Some folders in #{target} aren't writable. Some directories in #{target} aren't writable.
This can happen if you "sudo make install" software that isn't managed This can happen if you "sudo make install" software that isn't managed
by Homebrew. If a brew tries to add locale information to one of these by Homebrew. If a brew tries to add locale information to one of these
folders, then the install will fail during the link step. directories, then the install will fail during the link step.
You should probably `chown` them: You should probably `chown` them:
EOS EOS
Expand Down Expand Up @@ -283,25 +283,25 @@ def __check_folder_access base, msg


def check_access_pkgconfig def check_access_pkgconfig
__check_folder_access 'lib/pkgconfig', __check_folder_access 'lib/pkgconfig',
'If a brew tries to write a .pc file to this folder, the install will\n'+ 'If a brew tries to write a .pc file to this directory, the install will\n'+
'fail during the link step.' 'fail during the link step.'
end end


def check_access_include def check_access_include
__check_folder_access 'include', __check_folder_access 'include',
'If a brew tries to write a header file to this folder, the install will\n'+ 'If a brew tries to write a header file to this directory, the install will\n'+
'fail during the link step.' 'fail during the link step.'
end end


def check_access_etc def check_access_etc
__check_folder_access 'etc', __check_folder_access 'etc',
'If a brew tries to write a file to this folder, the install will\n'+ 'If a brew tries to write a file to this directory, the install will\n'+
'fail during the link step.' 'fail during the link step.'
end end


def check_access_share def check_access_share
__check_folder_access 'share', __check_folder_access 'share',
'If a brew tries to write a file to this folder, the install will\n'+ 'If a brew tries to write a file to this directory, the install will\n'+
'fail during the link step.' 'fail during the link step.'
end end


Expand Down Expand Up @@ -331,7 +331,7 @@ def check_xcode_prefix
return if prefix.nil? return if prefix.nil?
if prefix.to_s.match(' ') if prefix.to_s.match(' ')
puts <<-EOS.undent puts <<-EOS.undent
Xcode is installed to a folder with a space in the name. Xcode is installed to a directory with a space in the name.
This may cause some formulae, such as libiconv, to fail to build. This may cause some formulae, such as libiconv, to fail to build.
EOS EOS
Expand Down Expand Up @@ -501,13 +501,16 @@ def check_for_config_scripts


unless config_scripts.empty? unless config_scripts.empty?
puts <<-EOS.undent puts <<-EOS.undent
Some "config" scripts were found in your path, but not in system or Homebrew folders. Some "config" scripts were found in your path, but not in system or
Homebrew directories.
`./configure` scripts often look for *-config scripts to determine if software packages `./configure` scripts often look for *-config scripts to determine if
are installed, and what additional flags to use when compiling and linking. software packages are installed, and what additional flags to use when
compiling and linking.
Having additional scripts in your path can confuse software installed via Homebrew if Having additional scripts in your path can confuse software installed via
the config script overrides a system or Homebrew provided script of the same name. Homebrew if the config script overrides a system or Homebrew provided
script of the same name.
EOS EOS


Expand Down Expand Up @@ -537,7 +540,7 @@ def check_for_symlinked_cellar
which resolves to: #{HOMEBREW_CELLAR.realpath} which resolves to: #{HOMEBREW_CELLAR.realpath}
The recommended Homebrew installations are either: The recommended Homebrew installations are either:
(A) Have Cellar be a real folder inside of your HOMEBREW_PREFIX (A) Have Cellar be a real directory inside of your HOMEBREW_PREFIX
(B) Symlink "bin/brew" into your prefix, but don't symlink "Cellar". (B) Symlink "bin/brew" into your prefix, but don't symlink "Cellar".
Older installations of Homebrew may have created a symlinked Cellar, but this can Older installations of Homebrew may have created a symlinked Cellar, but this can
Expand Down Expand Up @@ -566,15 +569,15 @@ def check_for_multiple_volumes


unless where_cellar == where_temp unless where_cellar == where_temp
puts <<-EOS.undent puts <<-EOS.undent
Your Cellar & TEMP folders are on different volumes. Your Cellar and TEMP directories are on different volumes.
OS X won't move relative symlinks across volumes unless the target file OS X won't move relative symlinks across volumes unless the target file
already exists. already exists.
Brews known to be affected by this are Git and Narwhal. Brews known to be affected by this are Git and Narwhal.
You should set the "HOMEBREW_TEMP" environmental variable to a suitable You should set the "HOMEBREW_TEMP" environmental variable to a suitable
folder on the same volume as your Cellar. directory on the same volume as your Cellar.
EOS EOS
end end
Expand Down Expand Up @@ -797,7 +800,7 @@ def check_for_enthought_python
Enthought Python was found in your PATH. Enthought Python was found in your PATH.
This can cause build problems, as this software installs its own This can cause build problems, as this software installs its own
copies of iconv and libxml2 into folders that are picked up by copies of iconv and libxml2 into directories that are picked up by
other build systems. other build systems.
EOS EOS
Expand Down
4 changes: 2 additions & 2 deletions Library/Homebrew/formula_installer.rb
Expand Up @@ -232,7 +232,7 @@ def check_PATH
def check_manpages def check_manpages
# Check for man pages that aren't in share/man # Check for man pages that aren't in share/man
if (f.prefix+'man').exist? if (f.prefix+'man').exist?
opoo 'A top-level "man" folder was found.' opoo 'A top-level "man" directory was found.'
puts "Homebrew requires that man pages live under share." puts "Homebrew requires that man pages live under share."
puts 'This can often be fixed by passing "--mandir=#{man}" to configure.' puts 'This can often be fixed by passing "--mandir=#{man}" to configure.'
@show_summary_heading = true @show_summary_heading = true
Expand All @@ -242,7 +242,7 @@ def check_manpages
def check_infopages def check_infopages
# Check for info pages that aren't in share/info # Check for info pages that aren't in share/info
if (f.prefix+'info').exist? if (f.prefix+'info').exist?
opoo 'A top-level "info" folder was found.' opoo 'A top-level "info" directory was found.'
puts "Homebrew suggests that info pages live under share." puts "Homebrew suggests that info pages live under share."
puts 'This can often be fixed by passing "--infodir=#{info}" to configure.' puts 'This can often be fixed by passing "--infodir=#{info}" to configure.'
@show_summary_heading = true @show_summary_heading = true
Expand Down

0 comments on commit 44e13df

Please sign in to comment.