blog migration

mblumuga · Dec 16, 2016 · bc7761f · bc7761f
1 parent bbf9a7e
commit bc7761f
Show file tree

Hide file tree

Showing 41 changed files with 16 additions and 955 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
+# jekyll
+_site/
+
 # emacs
 *~
 
@@ -35,3 +38,6 @@ vignettes/*.pdf
 *.utf8.md
 *.knit.md
 .Rproj.user
+
+# sass
+.sass-cache/
diff --git a/CayekBlogR/.Rbuildignore b/CayekBlogR/.Rbuildignore
diff --git a/CayekBlogR/CayekBlogR.Rproj b/CayekBlogR/CayekBlogR.Rproj
diff --git a/CayekBlogR/DESCRIPTION b/CayekBlogR/DESCRIPTION
diff --git a/CayekBlogR/NAMESPACE b/CayekBlogR/NAMESPACE
diff --git a/CayekBlogR/R/blog.R b/CayekBlogR/R/blog.R
diff --git a/README.html b/README.html
@@ -144,7 +144,7 @@
         <a class="menuItem" href="publications.html">Publications</a>
         <a class="menuItem" href="software.html">Software</a>
         <a class="menuItem" href="teaching.html">Teaching</a>
-        <a class="menuItem" href="jekyll-now-master/_site/index.html">Blog</a>
+        <a class="menuItem" href="blog/index.html">Blog</a>
         <a class="menuItem" href="about.html">About</a>
         <a class="menuItem gitHub" href="https://github.com/cayek/cayek.github.io"></a>
         <a class="menuItem gitHubText" href="https://github.com/cayek/cayek.github.io">Source on GitHub</a>

diff --git a/Rakefile b/Rakefile
@@ -10,14 +10,14 @@ namespace :website do
   desc "Compile the site"
   task :render do
 
-    puts ("== Compiling blog with jekyll").green
-    Dir.chdir("jekyll-now-master/") do
-    end
+
 
     puts ("== Compiling website with Rmakrdown").green
     # build book
     sh 'Rscript -e "rmarkdown::render_site()"'
 
+    puts ("== Compiling blog with jekyll").green
+    sh 'jekyll build --source jekyll-now-master/ --destination blog/'
   end
 
   desc "view the site browser"

diff --git a/about.html b/about.html
@@ -144,7 +144,7 @@
         <a class="menuItem" href="publications.html">Publications</a>
         <a class="menuItem" href="software.html">Software</a>
         <a class="menuItem" href="teaching.html">Teaching</a>
-        <a class="menuItem" href="jekyll-now-master/_site/index.html">Blog</a>
+        <a class="menuItem" href="blog/index.html">Blog</a>
         <a class="menuItem" href="about.html">About</a>
         <a class="menuItem gitHub" href="https://github.com/cayek/cayek.github.io"></a>
         <a class="menuItem gitHubText" href="https://github.com/cayek/cayek.github.io">Source on GitHub</a>

diff --git a/include_header.html b/include_header.html
@@ -12,7 +12,7 @@
         <a class="menuItem" href="publications.html">Publications</a>
         <a class="menuItem" href="software.html">Software</a>
         <a class="menuItem" href="teaching.html">Teaching</a>
-        <a class="menuItem" href="jekyll-now-master/_site/index.html">Blog</a>
+        <a class="menuItem" href="blog/index.html">Blog</a>
         <a class="menuItem" href="about.html">About</a>
         <a class="menuItem gitHub" href="https://github.com/cayek/cayek.github.io"></a>
         <a class="menuItem gitHubText" href="https://github.com/cayek/cayek.github.io">Source on GitHub</a>

diff --git a/index.html b/index.html
@@ -144,7 +144,7 @@
         <a class="menuItem" href="publications.html">Publications</a>
         <a class="menuItem" href="software.html">Software</a>
         <a class="menuItem" href="teaching.html">Teaching</a>
-        <a class="menuItem" href="jekyll-now-master/_site/index.html">Blog</a>
+        <a class="menuItem" href="blog/index.html">Blog</a>
         <a class="menuItem" href="about.html">About</a>
         <a class="menuItem gitHub" href="https://github.com/cayek/cayek.github.io"></a>
         <a class="menuItem gitHubText" href="https://github.com/cayek/cayek.github.io">Source on GitHub</a>

diff --git a/jekyll-now-master/.gitignore b/jekyll-now-master/.gitignore
diff --git a/jekyll-now-master/404.md b/jekyll-now-master/404.md
diff --git a/jekyll-now-master/CNAME b/jekyll-now-master/CNAME
diff --git a/jekyll-now-master/LICENSE b/jekyll-now-master/LICENSE
diff --git a/jekyll-now-master/README.md b/jekyll-now-master/README.md
diff --git a/jekyll-now-master/_config.yml b/jekyll-now-master/_config.yml
diff --git a/jekyll-now-master/_includes/analytics.html b/jekyll-now-master/_includes/analytics.html