lib/runeblog.rb in runeblog-0.1.88 vs lib/runeblog.rb in runeblog-0.1.89

@@ -1,7 +1,6 @@
 require 'date'
-# require 'livetext'
 
 require 'runeblog_version'
 require 'global'
 require 'helpers-blog'
 require 'default'
@@ -23,11 +22,10 @@
   make_exception(:ViewAlreadyExists, "View $1 already exists")
   make_exception(:DirAlreadyExists,  "Directory $1 already exists")
   make_exception(:CantCreateDir,     "Can't create directory $1")
   make_exception(:EditorProblem,     "Could not edit $1")
   make_exception(:NoSuchView,        "No such view: $1")
-# make_exception(:LivetextError,     "Livetext#process_file returned nil for $1")
   make_exception(:NoBlogAccessor, "Runeblog.blog is not set")
 
   
   class << self
     attr_accessor :blog
@@ -183,16 +181,18 @@
     copy!("#{Themes}", "themes")
     create_dir('assets')
     create_dir('posts')
 
     create_dir('staging')
-    create_dir('staging/assets')
+#   create_dir('staging/assets')
+#   create_dir('staging/blog')
     create_dir('remote')
-    create_dir('remote/assets')
+#   create_dir('remote/assets')
 
     copy!("themes/standard/*", "staging/")
-    copy("themes/standard/assets/*", "remote/assets/")
+#   copy!("themes/standard/blog/*", "staging/blog/")
+    copy!("themes/standard/*", "remote/")
 
     pub = "user: xxx\nserver: xxx\ndocroot: xxx\npath: xxx\nproto: xxx\n"
     dump(pub, "publish")
 
     # Add to global.lt3 here?  FIXME
@@ -246,11 +246,11 @@
   end
 
   def teaser(slug)
     id = slug.to_i
     text = nil
-    post_entry_name = @theme + "/blog-_postentry.lt3"
+    post_entry_name = @theme + "/blog/post_entry.lt3"
     @_post_entry ||= File.read(post_entry_name)
     vp = post_lookup(id)
     nslug, aslug, title, date, teaser_text = 
       vp.nslug, vp.aslug, vp.title, vp.date, vp.teaser_text
     path = vp.path
@@ -410,10 +410,10 @@
           livetext draft, html
           # link to POST??
           copy html, "../remote"
           collect_recent_posts("recent.html")
           copy("recent.html", "../remote")
-          livetext "blog-generate",  "../remote/index"
+          livetext "blog/generate",  "../remote/index"
         end
       end
     end
   end