From 3535397c41976bb298825c2ed2d5ded81cc0c924 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Thu, 20 Dec 2007 00:21:53 +0000
Subject: sisupod, bugfixes for rsync placement and for download and processing

---
 lib/sisu/v0/sysenv.rb | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'lib/sisu/v0/sysenv.rb')

diff --git a/lib/sisu/v0/sysenv.rb b/lib/sisu/v0/sysenv.rb
index a78bec85..fa6be6cb 100644
--- a/lib/sisu/v0/sysenv.rb
+++ b/lib/sisu/v0/sysenv.rb
@@ -375,15 +375,19 @@ module SiSU_Env
           @@fnb ||=@fns[m,2]
           @@fnt ||=@fns[m,3]
           @@flv ||=document_language_versions_found[:f]
-          @@fnz ||=if @@fns =~/(?:\~\S{2,3})?\.(?:ssm\.sst|ssm)$/; @@fnb + '.ssm.zip'
-          else @@fnb + '.sst.zip'
+          unless @@fns =~/\S+?\.zip/
+            @@fnz ||=if @@fns =~/(?:\~\S{2,3})?\.(?:ssm\.sst|ssm)$/; @@fnb + '.ssm.zip'
+            else @@fnb + '.sst.zip'
+            end
           end
         else m=/(.+?)\.((?:-|ssm\.)?sst|ssm)$/
           @@fnb ||=@fns[m,1]
           @@fnm ||=@fns[m,1]
           @@fnt ||=@fns[m,2]
-          @@fnz ||=if @@fns =~/(?:\~\S{2,3})?\.(?:ssm\.sst|ssm)$/; @@fnb + '.ssm.zip'
-          else @@fnb + '.sst.zip'
+          unless @@fns =~/\S+?\.zip/
+            @@fnz ||=if @@fns =~/(?:\~\S{2,3})?\.(?:ssm\.sst|ssm)$/; @@fnb + '.ssm.zip'
+            else @@fnb + '.sst.zip'
+            end
           end
         end
       end
@@ -786,7 +790,7 @@ module SiSU_Env
     @@image_flag,@@local_image=true,true   #warning on @@image_flag
     @@fb=@@man_path=nil,nil
     def initialize(fns='',md=nil)
-      super() #you may not want to re-execute this tatic info so frequently!
+      super() #you may not want to re-execute this static info so frequently!
       @fns,@md=fns,md
       @env=Env_call.new(fns) if fns
       fnb=if @md \
@@ -2179,7 +2183,6 @@ WOK
       @env=SiSU_Env::Info_env.new
     end
     def zap
-p @zap
       if @zap !~/\/\//; rm_rf(@zap) if FileTest.directory?(@zap)
       else puts 'suspect zap request, ignored'
       end
-- 
cgit v1.2.3