lib/scms/s3deploy.rb in scms-2.0.3 vs lib/scms/s3deploy.rb in scms-2.0.5

@@ -7,31 +7,24 @@
         #scmsSettings = ScmsUtils.getsettings(yamlpath)
 
         ENV["S3CONF"] = config
         ENV["AWS_CALLING_FORMAT"] = "SUBDOMAIN"
         ENV["S3SYNC_MIME_TYPES_FILE"] = mimetypefile
-        puts "S3SYNC_MIME_TYPES_FILE: #{ENV["S3SYNC_MIME_TYPES_FILE"] }"
+        #puts "S3SYNC_MIME_TYPES_FILE: #{ENV["S3SYNC_MIME_TYPES_FILE"] }"
 
         s3yamlpath=File.join(config, "_s3config.yml")
         settings = YAML.load_file(s3yamlpath)
         throw "No bucket defined in _s3config.yml settings file" if settings['bucket'] == nil
         ScmsUtils.log( "Syncing with Amazon S3: #{settings['bucket']}" )
-        
-        removeold = "--delete"
-        if settings['clean'] != nil
-            unless settings['clean']
-                removeold = ""
-            end
-        end
 
         exclude = "(\\.svn$)|(^_)"
         if settings['ignore'] != nil
             exclude = "#{exclude}|(#{settings["ignore"]})"
         end
         
         cmd = "s3sync"
-        params = "#{removeold} --exclude=\"#{exclude}\" --progress --make-dirs --recursive"
+        params = "--exclude=\"#{exclude}\" --progress --make-dirs --recursive"
 
         #First deploy private directories
         Dir.glob("#{pub}/_*/").each do |f|
             privatedir = File.basename(f)
             ScmsUtils.log( "Backing up #{privatedir} (private)" )
@@ -47,10 +40,12 @@
                 ScmsUtils.run(cmd, cacheparams)
             end
         end
 
         ScmsUtils.log( "Syncing root (public)" )
-        roorparams = "#{params}  --public-read \"#{pub}/\" #{settings['bucket']}:/"
+        removeold = ""
+        removeold = "--delete"  if settings['clean'].to_s == "true"
+        roorparams = "#{removeold} #{params} --public-read \"#{pub}/\" #{settings['bucket']}:/"
         #Finnaly deploy all remaining files (except excludes)
         ScmsUtils.run(cmd, roorparams)
         ScmsUtils.successLog("Deployed :)")
         
         if settings['uri'] != nil
\ No newline at end of file