diff options
Diffstat (limited to 'lib/sisu/v5/hub.rb')
| -rw-r--r-- | lib/sisu/v5/hub.rb | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/lib/sisu/v5/hub.rb b/lib/sisu/v5/hub.rb index 5d291f9b..510e2092 100644 --- a/lib/sisu/v5/hub.rb +++ b/lib/sisu/v5/hub.rb @@ -93,6 +93,22 @@ module SiSU end end end + class HubClose + def initialize(call_path) + begin + @env=SiSU_Env::InfoEnv.new + rescue + ensure + if FileTest.directory?(@env.processing_path.processing) \ + and @env.processing_path.processing_base_tmp =~/^\/tmp\/\S+/ + FileUtils::cd(@env.processing_path.processing_base_tmp) do + FileUtils::rm_rf('.') + end + end + Dir.chdir(call_path) + end + end + end class OptionLoopFiles attr_reader :opt def initialize(opt) @@ -111,6 +127,7 @@ module SiSU @opt.pth=@opt.f_pths[i][:pth] @opt.lng=@opt.f_pths[i][:lng] Dir.chdir(@opt.f_pth[:pth]) #watch + SiSU_Env::FilenameLanguageCodeInsert.new(@opt,@opt.lng).language_code_insert # ... track @env=SiSU_Env::InfoEnv.new(fno) yield end @@ -612,20 +629,12 @@ module SiSU path[:xsd]=path[:xml] + '/rng' re_p3=/(sisupod(?:\.txz)?|\S+?\.ss[mt]\.txz|[^\/]+?\.ssp)$/ unless @opt.files.join(',') =~ re_p3 #do not mix pods with source markup files in command line - # unless ( FileTest.directory?(path[:css]) \ - # and FileTest.directory?(path[:xsd]) ) - # @opt.cmd=@opt.cmd +='C' unless @opt.cmd =~/C/ #FIX - # end if @opt.act[:maintenance][:set] ==:on $VERBOSE=false #debug $VERBOSE=true end end re_p2=/(sisupod(?:\.zip)?|\S+?\.ss[mt]\.zip)$/ unless @opt.files.join(',') =~ re_p2 #do not mix pods with source markup files in command line - # unless ( FileTest.directory?(path[:css]) \ - # and FileTest.directory?(path[:xsd]) ) - # @opt.cmd=@opt.cmd +='C' unless @opt.cmd =~/C/ #FIX - # end if @opt.act[:maintenance][:set] ==:on $VERBOSE=false #debug $VERBOSE=true end @@ -792,8 +801,10 @@ module SiSU and @@env.user \ and FileTest.directory?(@@env.processing_path.processing) \ and @@env.processing_path.processing =~/#{@@env.user}$/ #clean temporary processing directory of content as is located in public area - FileUtils::cd(@@env.processing_path.processing_base_tmp) do - FileUtils::rm_rf(@@env.user) unless @opt.act[:maintenance][:set] ==:on + if @@env.processing_path.processing_base_tmp =~/^\/tmp\/\S+/ + FileUtils::cd(@@env.processing_path.processing_base_tmp) do + FileUtils::rm_rf('.') unless @opt.act[:maintenance][:set] ==:on + end end end elsif action_on_file_ == :true \ |