From c94f591946a0436767f2fa0637f1cfd2c22ff3d6 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 23 May 2007 23:36:19 +0100 Subject: restrict use to ruby1.8, plus some minor housekeeping changes file exist? instead of exists? --- lib/sisu/0.52/sysenv.rb | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'lib/sisu/0.52/sysenv.rb') diff --git a/lib/sisu/0.52/sysenv.rb b/lib/sisu/0.52/sysenv.rb index 9bd2e977..56171c06 100644 --- a/lib/sisu/0.52/sysenv.rb +++ b/lib/sisu/0.52/sysenv.rb @@ -205,7 +205,7 @@ module SiSU_Env def prog load_prog=false $:.each do |reqpath| - if FileTest.exists?("#{reqpath}/#@prog.rb") + if FileTest.exist?("#{reqpath}/#@prog.rb") load_prog=true break end @@ -224,7 +224,7 @@ module SiSU_Env def prog? load_prog=false $:.each do |reqpath| - if FileTest.exists?("#{reqpath}/#@prog.rb"); load_prog=true + if FileTest.exist?("#{reqpath}/#@prog.rb"); load_prog=true break end end @@ -249,12 +249,12 @@ module SiSU_Env def yamlrc unless @@rc @yamlrc_path.each do |v| - if @@noyaml or FileTest.exists?("#{v}/noyaml") + if @@noyaml or FileTest.exist?("#{v}/noyaml") puts "WARNING - YAML loading switched off, to enable delete the file:\n\t#{v}/noyaml\n\n" unless @@noyaml @@noyaml=true break else - if FileTest.exists?("#{v}/sisurc.yml") + if FileTest.exist?("#{v}/sisurc.yml") unless @@rc require 'yaml' @@rc ||= YAML::load(File::open("#{v}/sisurc.yml")) @@ -262,7 +262,7 @@ module SiSU_Env break end unless @@rc - if FileTest.exists?("#{v}/sisurc.yaml") + if FileTest.exist?("#{v}/sisurc.yaml") unless @@rc require 'yaml' @@rc ||= YAML::load(File::open("#{v}/sisurc.yaml")) @@ -278,13 +278,13 @@ module SiSU_Env def ads #WORK AREA tell_no_yaml='WARNING - YAML loading switched off, to enable delete the file:' @ad_path.each do |v| - if @@noyaml or FileTest.exists?("#{v}/noyaml") + if @@noyaml or FileTest.exist?("#{v}/noyaml") puts tell_no_yaml + "\n\t#{v}/noyaml\n" unless @@noyaml @@noyaml=true break else #tell=SiSU_Screen::Ansi.new('','promo off (file not found): list.yml') - if FileTest.exists?("#{v}/list.yml") + if FileTest.exist?("#{v}/list.yml") unless @@ad[:promo_list] require 'yaml' @@ad[:promo_list] ||= YAML::load(File::open("#{v}/list.yml")) @@ -297,13 +297,13 @@ module SiSU_Env end end @ad_path.each do |v| - if @@noyaml or FileTest.exists?("#{v}/noyaml") + if @@noyaml or FileTest.exist?("#{v}/noyaml") puts tell_no_yaml + "\n\t#{v}/noyaml\n" unless @@noyaml @@noyaml=true break else #tell=SiSU_Screen::Ansi.new('','promo off (file not found): promo.yml') - if FileTest.exists?("#{v}/promo.yml") + if FileTest.exist?("#{v}/promo.yml") unless @@ad[:promo] require 'yaml' @@ad[:promo] ||= YAML::load(File::open("#{v}/promo.yml")) @@ -752,7 +752,7 @@ module SiSU_Env @sys.locale end def concord_max - concord_max=if defined? @rc['processing']['concord_max'] and @rc['processing']['concord_max']: + concord_max=if defined? @rc['processing']['concord_max'] and @rc['processing']['concord_max'] @rc['processing']['concord_max'] else defaults[:concord_max] end @@ -1051,14 +1051,14 @@ module SiSU_Env end def yamlrc rc.each do |v| - if FileTest.exists?("#{v}/sisurc.yml") + if FileTest.exist?("#{v}/sisurc.yml") @yamlrc_dir="#{v}/sisurc.yml" break end end unless @yamlrc_dir rc.each do |v| - if FileTest.exists?("#{v}/sisurc.yaml") + if FileTest.exist?("#{v}/sisurc.yaml") @yamlrc_dir="#{v}/sisurc.yaml" break end -- cgit v1.2.3