bin/scms in scms-1.9.0 vs bin/scms in scms-1.9.2

@@ -55,29 +55,27 @@
 optparse.parse!
 
 #Set globals
 $website = (options[:website].nil?) ? Dir.pwd : options[:website] 
 $html = (ENV["SCMS_HTML_OUT"] or "false")
+#puts "html mode: #{$html}"
 $stdout.sync = true
 root_folder = File.expand_path("../", File.dirname(__FILE__))
 Folders = {
   :root => root_folder,
   :website => File.join($website),
   :pub => (ENV["SCMS_PUBLISH_FOLDER"] or options[:pub]),
-  :assets => (ENV["SCMS_STATICCMS_FOLDER"] or File.join(root_folder, "assets")),
+  :assets => File.join(root_folder, "assets"),
   :config => (ENV["SCMS_CONFIG_FOLDER"] or File.join($website))
 }
 
 if options[:action] == "create"
     if Dir.exists? Folders[:website]
         throw "Website already exists!!!"
     else
         puts "Making website: #{Folders[:website]}"
         FileUtils.mkdir_p Folders[:website]
-        Dir.chdir(File.join(Folders[:assets], "blank-template")) do
-            files = Dir.glob('*')
-            FileUtils.cp_r files, Folders[:website]
-        end
+        FileUtils.cp_r(Dir["#{File.join(Folders[:assets], "blank-template")}/*"], Folders[:website])
     end
     exit
 end
 
 #puts "System root folder = #{Folders[:root]}"
\ No newline at end of file