aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v4/sysenv.rb
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2013-03-05 21:47:08 -0500
committerRalph Amissah <ralph@amissah.com>2013-03-05 21:47:08 -0500
commit98b3549d115436c0419d29cf7d7f5521a3640e7b (patch)
treecaf01b400b81813983283778e03060c86e529136 /lib/sisu/v4/sysenv.rb
parentdebian/changelog (4.0.9-1) (diff)
parentv4: html, epub, minor "cleaning" of output (diff)
Merge tag 'sisu_4.0.10' into debian/sid
SiSU 4.0.10
Diffstat (limited to 'lib/sisu/v4/sysenv.rb')
-rw-r--r--lib/sisu/v4/sysenv.rb12
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/sisu/v4/sysenv.rb b/lib/sisu/v4/sysenv.rb
index 17acc872..c3f69c85 100644
--- a/lib/sisu/v4/sysenv.rb
+++ b/lib/sisu/v4/sysenv.rb
@@ -470,9 +470,11 @@ module SiSU_Env
or ((defined? @rc['output_structure']['by_filename']) \
&& @rc['output_structure']['by_filename'] ==true)
:filename
- else #recheck current default
+ else #set default
:language
end
+ else #set default
+ :language
end
end
def dump?
@@ -789,14 +791,14 @@ module SiSU_Env
program='identify'
program_ref="\n\t\tsee <http://www.imagemagick.org/>"
found=(program_found?(program)) ? true : false
- STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}" unless found
+ #STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}" unless found
found
end
def graphicksmagick #graphicsmagick is a image manipulation program
program='gm'
program_ref="\n\t\tsee <http://www.graphicsmagick.org/>"
found=(program_found?(program)) ? true : false
- STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}" unless found
+ #STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}" unless found
found
end
def well_formed? #tidy - check for well formed xml xhtml etc.
@@ -3487,6 +3489,7 @@ WOK
class InfoVersion <InfoEnv
include Singleton
require 'rbconfig'
+ require 'yaml'
@@lib_path=nil
def get_version
@version={}
@@ -3496,7 +3499,8 @@ WOK
: "#{defaults[:sisu_share]}/#{SiSU_version_dir}/v/version.yml"
lib_path=@@lib_path ? @@lib_path : `echo $RUBYLIB`.split(':')
@@lib_path ||=lib_path
- if File.exist?(yst_ver); @version=YAML::load(File::open(yst_ver)) #unless @@noyaml
+ if File.exist?(yst_ver)
+ @version=YAML::load(File::open(yst_ver)) #unless @@noyaml
end
@version
end