0
@@ -26,9 +26,9 @@ class Theme
0
   end
0
   
0
   def each_asset_path(&proc)
0
-    [:stylesheet => "stylesheets", :image => "images", :javascript => "javascripts"].each_pair do |k, v|
0
+    {:stylesheet => "stylesheets", :image => "images", :javascript => "javascripts"}.each_pair do |k, v|
0
       source = File.join(path, 'assets', v)
0
-      target = File.join(Merb.dir_for(k), manifest['name'])
0
+      target = File.join(Merb.dir_for(k), name)
0
       proc.call(source, target)
0
     end
0
   end
0
@@ -36,7 +36,7 @@ class Theme
0
   def install_assets
0
     each_asset_path do |source, target|
0
       FileUtils.mkdir_p(target)
0
-      File.mv(Dir.glob(File.join(source, '*')), target)
0
+      FileUtils.cp_r(Dir.glob(File.join(source, '*')), target)
0
     end
0
   end
0