diff options
author | Ralph Amissah <ralph@amissah.com> | 2014-08-08 00:21:14 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2014-08-08 00:21:14 -0400 |
commit | 03f79b10f928c7bb7791b7ea3ee9e8222eb15cc9 (patch) | |
tree | 9f1f7de42705f734d8d456f3708db19146804ecf /lib/sisu/v6/se_programs.rb | |
parent | debian/changelog (5.5.5-1) (diff) | |
parent | v6: hub, further changes related to use of opt.act; hub file split (diff) |
Merge tag 'sisu_5.5.6' into debian/sid
SiSU 5.5.6
Diffstat (limited to 'lib/sisu/v6/se_programs.rb')
-rw-r--r-- | lib/sisu/v6/se_programs.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/sisu/v6/se_programs.rb b/lib/sisu/v6/se_programs.rb index 5771c4a4..448ac98e 100644 --- a/lib/sisu/v6/se_programs.rb +++ b/lib/sisu/v6/se_programs.rb @@ -87,7 +87,7 @@ module SiSU_Sys_Call end @sys.locale end - def file_encoding(filename,cmd='') #file encoding + def file_encoding(filename,act='') #file encoding program='file' fnsp=SiSU_Env::InfoEnv.new(filename).source_file_with_path if program_found?(program) @@ -98,9 +98,13 @@ module SiSU_Sys_Call encoding else 'UTF-8 assumed, encoding undetermined' end - puts encoding if cmd =~/[VM]/ + if act[:verbose_plus][:set] ==:on \ + or act[:maintenance][:set] ==:on + puts encoding + end encoding - else encoding='UTF-8 assumed, file encoding check program unavailable' + else + 'UTF-8 assumed, file encoding check program unavailable' end end def wc #word count |