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.

Sign up for GitHub

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

Jump to bottom

update File.exists? calls to File.exist? #893

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update File.exists? calls to File.exist? #893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ task :install_vundle do
puts ""

vundle_path = File.join('vim','bundle', 'vundle')
unless File.exists?(vundle_path)
unless File.exist?(vundle_path)
run %{
cd $HOME/.yadr
git clone https://github.com/gmarik/vundle.git #{vundle_path}
Expand Down Expand Up @@ -197,7 +197,7 @@ def install_term_theme
run %{ /usr/libexec/PlistBuddy -c "Merge 'iTerm2/Solarized Dark.itermcolors' :'Custom Color Presets':'Solarized Dark'" ~/Library/Preferences/com.googlecode.iterm2.plist }

# If iTerm2 is not installed or has never run, we can't autoinstall the profile since the plist is not there
if !File.exists?(File.join(ENV['HOME'], '/Library/Preferences/com.googlecode.iterm2.plist'))
if !File.exist?(File.join(ENV['HOME'], '/Library/Preferences/com.googlecode.iterm2.plist'))
puts "======================================================"
puts "To make sure your profile is using the solarized theme"
puts "Please check your settings under:"
Expand Down Expand Up @@ -279,7 +279,7 @@ def install_prezto
puts "Zsh is already configured as your shell of choice. Restart your session to load the new settings"
else
puts "Setting zsh as your default shell"
if File.exists?("/usr/local/bin/zsh")
if File.exist?("/usr/local/bin/zsh")
if File.readlines("/private/etc/shells").grep("/usr/local/bin/zsh").empty?
puts "Adding zsh to standard shell list"
run %{ echo "/usr/local/bin/zsh" | sudo tee -a /private/etc/shells }
Expand Down Expand Up @@ -310,7 +310,7 @@ def install_files(files, method = :symlink)
puts "Source: #{source}"
puts "Target: #{target}"

if File.exists?(target) && (!File.symlink?(target) || (File.symlink?(target) && File.readlink(target) != source))
if File.exist?(target) && (!File.symlink?(target) || (File.symlink?(target) && File.readlink(target) != source))
puts "[Overwriting] #{target}...leaving original at #{target}.backup..."
run %{ mv "$HOME/.#{file}" "$HOME/.#{file}.backup" }
end
Expand All @@ -327,7 +327,7 @@ def install_files(files, method = :symlink)
end

def needs_migration_to_vundle?
File.exists? File.join('vim', 'bundle', 'tpope-vim-pathogen')
File.exist? File.join('vim', 'bundle', 'tpope-vim-pathogen')
end


Expand Down
8 changes: 4 additions & 4 deletions bin/marky.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
$options[:outfolder] = false
opts.on( '-o DIR','--output DIR', 'Output folder, default STDOUT. Use "." for current folder, void if output type is "nv"' ) do |outfolder|
filepath = File.expand_path(outfolder)
unless File.exists?(filepath) && File.directory?(filepath)
if File.exists?(filepath)
unless File.exist?(filepath) && File.directory?(filepath)
if File.exist?(filepath)
puts "Output folder is not a directory"
exit
else
Expand Down Expand Up @@ -90,7 +90,7 @@ def html_to_markdown(input,filename = false)
def html_file_to_markdown(outtype)
$input.each {|file|
input = File.expand_path(file)
if File.exists?(input)
if File.exist?(input)
html = File.open(input,'r') {|infile|
CGI.escape(CGI.unescapeHTML(infile.read))
}
Expand Down Expand Up @@ -206,7 +206,7 @@ def webarchive_to_markdown(outtype)
def bookmark_to_markdown(outtype)
$input.each {|f|
file = File.expand_path(f)
if File.exists?(file)
if File.exist?(file)
outfile = $options[:outfolder] ? $options[:outfolder] : ""
outfile += %x{mdls -name 'kMDItemDisplayName' -raw "#{file}"}.strip.gsub(/(\.webbookmark|\.webloc)$/,'') + '.md'
source_url = %x{mdls -name 'kMDItemURL' -raw "#{file}"}.strip
Expand Down
4 changes: 2 additions & 2 deletions bin/yadr/lib/git-style-binaries-0.1.11/lib/git-style-binary/helpers/name_resolver.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ def list_subcommands(filename=zero)
# available
def binary_filename_for(name)
user_file = File.join(binary_directory, "#{basename}-#{name}")
return user_file if File.exists?(user_file)
return user_file if File.exist?(user_file)
built_in = File.join(built_in_commands_directory, "#{name}.rb")
return built_in if File.exists?(built_in)
return built_in if File.exist?(built_in)
user_file
end

Expand Down
4 changes: 2 additions & 2 deletions bin/yadr/vundle.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ def self.update_vundle

private
def self.contains_vundle?(vundle_name)
FileUtils.touch(@vundles_path) unless File.exists? @vundles_path
FileUtils.touch(@vundles_path) unless File.exist? @vundles_path
File.read(@vundles_path).include?(vundle_name)
end

def self.vundles_from_file
FileUtils.touch(@vundles_path) unless File.exists? @vundles_path
FileUtils.touch(@vundles_path) unless File.exist? @vundles_path
File.read(@vundles_path).split("\n")
end

Expand Down