diff options
| author | Ralph Amissah <ralph@amissah.com> | 2014-01-06 23:05:26 -0500 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2014-01-06 23:05:26 -0500 |
| commit | 4075d476731a7a1c29e399d60f6baa210f3d1cb4 (patch) | |
| tree | b0fab3d856f64f0562b7b7da317cf79c3b3e05f1 /lib/sisu/v4/sysenv.rb | |
| parent | debian/changelog (4.2.16-1) (diff) | |
| parent | v5: heading recalibration, code (downstream) changes (diff) | |
Merge tag 'sisu_4.2.17' into debian/sid
SiSU 4.2.17
Diffstat (limited to 'lib/sisu/v4/sysenv.rb')
| -rw-r--r-- | lib/sisu/v4/sysenv.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/sisu/v4/sysenv.rb b/lib/sisu/v4/sysenv.rb index c0598070..b216089d 100644 --- a/lib/sisu/v4/sysenv.rb +++ b/lib/sisu/v4/sysenv.rb @@ -797,7 +797,7 @@ module SiSU_Env ? (system(%{ echo "#{@input}" | #{program} -s 3 -o #{@output} })) - : (STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}" if cmd =~/V/) + : (STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}" if @cmd =~/V/) #found end def imagemagick #imagemagick is a image manipulation program @@ -3599,6 +3599,11 @@ WOK if File.exist?(yst_ver) @version=YAML::load(File::open(yst_ver)) #unless @@noyaml end + spec = Gem::Specification.find_by_name("sisu") + gem_root = spec.gem_dir + @version[:install_method]=(File.dirname(__FILE__.gsub(/\/lib\/sisu\/#{SiSU_version_dir}/,'')) == gem_root) \ + ? ' (ruby gem install)' + : '' @version end def rbversion @@ -3618,7 +3623,7 @@ WOK @color.cmd else '-v' end - SiSU_Screen::Ansi.new(opt_cmd,version[:project],version[:version],version[:date_stamp],version[:date],rb_ver).version + SiSU_Screen::Ansi.new(opt_cmd,version[:project],version[:version],version[:date_stamp],version[:date],version[:install_method],rb_ver).version else puts 'SiSU (version information not available)' end end |