From d3b03b940a2a9698ab2d68ce73eb564f69f4aff4 Mon Sep 17 00:00:00 2001 From: Jason Barnett Date: Tue, 21 May 2024 09:45:50 -0600 Subject: [PATCH] update File.exists? calls to File.exist? --- Rakefile | 10 +++++----- bin/marky.rb | 8 ++++---- .../lib/git-style-binary/helpers/name_resolver.rb | 4 ++-- bin/yadr/vundle.rb | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Rakefile b/Rakefile index f23a9050..b600f276 100644 --- a/Rakefile +++ b/Rakefile @@ -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} @@ -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:" @@ -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 } @@ -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 @@ -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 diff --git a/bin/marky.rb b/bin/marky.rb index 2a036b11..09c20810 100755 --- a/bin/marky.rb +++ b/bin/marky.rb @@ -18,8 +18,8 @@ optparse = OptionParser.new do|opts| $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 @@ -90,7 +90,7 @@ end 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)) } @@ -206,7 +206,7 @@ end 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 diff --git a/bin/yadr/lib/git-style-binaries-0.1.11/lib/git-style-binary/helpers/name_resolver.rb b/bin/yadr/lib/git-style-binaries-0.1.11/lib/git-style-binary/helpers/name_resolver.rb index e6edbd69..e7475496 100644 --- a/bin/yadr/lib/git-style-binaries-0.1.11/lib/git-style-binary/helpers/name_resolver.rb +++ b/bin/yadr/lib/git-style-binaries-0.1.11/lib/git-style-binary/helpers/name_resolver.rb @@ -36,9 +36,9 @@ module Helpers # 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 diff --git a/bin/yadr/vundle.rb b/bin/yadr/vundle.rb index 45e31c9e..c59e5d5f 100644 --- a/bin/yadr/vundle.rb +++ b/bin/yadr/vundle.rb @@ -32,12 +32,12 @@ module 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