ferron

commit 1efaa095579119c38ef59043d2035feea3c988a3
parent 07467037f7fcd969e9e5e006c46f0efe45a6d3f3
Author: Hugo Soucy <hugo.soucy@savoirfairelinux.com>
Date:   Wed, 31 Jan 2018 14:22:28 -0500

Change some output texts

Diffstat:
M
functions/make-atom-feed.lua
 | 
6
++----
M
functions/make-lists-of-pages.lua
 | 
7
++-----
M
functions/make-pages.lua
 | 
7
+++----

3 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/functions/make-atom-feed.lua b/functions/make-atom-feed.lua
@@ -12,7 +12,7 @@ local function makeatomfeed()
     local feedfile = Ferron.site.path .. Ferron.site.config.SITE.PATHS.HTML .. "/feed.atom.xml"
     local feedrssfile = Ferron.site.path .. Ferron.site.config.SITE.PATHS.HTML .. "/feed.rss.xml"
 
-    print("§ Make an ATOM feed with all the pages of the site:")
+    print("§ Make an ATOM feed with all the pages of the site ...")
 
     feed["SITE"] = Ferron.site.config.SITE
     feed["entries"] = {}
@@ -43,9 +43,7 @@ local function makeatomfeed()
         )
     )
 
-    if path.isfile(feedfile) ~= false then
-        print(" ¬ /feed.atom.xml - created")
-    else
+    if path.isfile(feedfile) == false then
         print(" !! /feed.atom.xml - error!")
     end
 
diff --git a/functions/make-lists-of-pages.lua b/functions/make-lists-of-pages.lua
@@ -27,7 +27,7 @@ local function makelistsofpages()
                 local listindex_length = listindex_metadatas_mt.length ~= nil and listindex_metadatas_mt.length or nil
                 local pagecounter = listindex_length ~= nil and 0 or nil
 
-                print("§ Make an index page for the `" .. listindex_section .. "` section:")
+                print("§ Make an index page for the `" .. ferronutils.getrelpath(listindex_dir) .. "` section ...")
 
                 -- Convert the markdown file to HTML
                 listindex_metadatas_mt.content = markdown(fileutils.pullfilecontent(listindex))
@@ -100,9 +100,7 @@ local function makelistsofpages()
                     )
                 )
 
-                if path.isfile(listindex_htmlpath .. "/" .. listindex_plainname .. ".html") ~= false then
-                    print(" ¬ " .. listindex_relpath .. ".html - created")
-                else
+                if path.isfile(listindex_htmlpath .. "/" .. listindex_plainname .. ".html") == false then
                     print(" !! " .. listindex_relpath .. ".html - error!")
                 end
 
@@ -121,7 +119,6 @@ local function makelistsofpages()
             reverse = false; -- subdirs at first
         }
     )
-    print("==========")
 end
 
 return makelistsofpages
diff --git a/functions/make-pages.lua b/functions/make-pages.lua
@@ -14,7 +14,8 @@ local function makepages()
     local shortlinks = {}
 
     -- Loop in the content directory
-    print("- Looking for markdown in " .. contentpath)
+    print("- Looking for markdown in " .. contentpath .. " ...")
+    print(" ¬ Then make the HTML pages of the site ...")
 
     path.each(
         contentpath .. "/*.md",
@@ -57,9 +58,7 @@ local function makepages()
                     )
                 )
 
-                if path.isfile(md_htmlpath .. "/" .. md_plainname .. ".html") ~= false then
-                    print(" ¬ " .. md_relpath .. ".html - created")
-                else
+                if path.isfile(md_htmlpath .. "/" .. md_plainname .. ".html") == false then
                     print(" !! " .. md_relpath .. ".html - error!")
                 end