From 34404af0319ae6350a4ad3c3da3b109eb8cb37c5 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Tue, 30 Aug 2016 09:22:44 +0530 Subject: [PATCH 1/3] execute jekyll from cloned source --- script/default-site | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/default-site b/script/default-site index 5e96a991..041c7e97 100755 --- a/script/default-site +++ b/script/default-site @@ -10,7 +10,7 @@ rm -Rf ./tmp/default-site workdir=$(pwd) echo "$0: creating new default site" -bundle exec ruby exe/jekyll new tmp/default-site +bundle exec jekyll new tmp/default-site pushd tmp/default-site echo "$0: respecifying the jekyll install location" From f3093e2f6f17c5490dc3e6c70dc11ebdcad05b0e Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Tue, 30 Aug 2016 09:35:07 +0530 Subject: [PATCH 2/3] change workdir assignment --- script/default-site | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/script/default-site b/script/default-site index 041c7e97..6530c320 100755 --- a/script/default-site +++ b/script/default-site @@ -7,11 +7,10 @@ echo "$0: setting up tmp directory" mkdir -p ./tmp rm -Rf ./tmp/default-site -workdir=$(pwd) - echo "$0: creating new default site" bundle exec jekyll new tmp/default-site pushd tmp/default-site +workdir="../../" echo "$0: respecifying the jekyll install location" ruby -e "contents = File.read('Gemfile'); File.write('Gemfile', contents.sub(/gem \"jekyll\".*\\n/, 'gem \"jekyll\", path: \"$workdir\"'))" From b2ece36d27166037e364a30597126b5babd59527 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Tue, 30 Aug 2016 22:15:00 +0530 Subject: [PATCH 3/3] remove variable workdir --- script/default-site | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/script/default-site b/script/default-site index 6530c320..899524a7 100755 --- a/script/default-site +++ b/script/default-site @@ -10,10 +10,9 @@ rm -Rf ./tmp/default-site echo "$0: creating new default site" bundle exec jekyll new tmp/default-site pushd tmp/default-site -workdir="../../" echo "$0: respecifying the jekyll install location" -ruby -e "contents = File.read('Gemfile'); File.write('Gemfile', contents.sub(/gem \"jekyll\".*\\n/, 'gem \"jekyll\", path: \"$workdir\"'))" +ruby -e "contents = File.read('Gemfile'); File.write('Gemfile', contents.sub(/gem \"jekyll\".*\\n/, 'gem \"jekyll\", path: \"../../\"'))" echo "$0: installing default site dependencies" BUNDLE_GEMFILE=Gemfile bundle install echo "$0: building the default site"