Merge pull request #197 from pzelnip/fixDevEnv

pzelnip · web-flow · commit 93253b872e86 · 2021-03-06T20:06:26.000-08:00
More fixes for running locally
diff --git a/Makefile b/Makefile
@@ -30,13 +30,14 @@ clean:
 	docker images | grep $(SITE_NAME) | awk {'print $3'} | xargs docker rmi
 
 regenerate:
-	$(PELICAN) -r $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
+	$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
+	if test -d $(BASEDIR)/extra; then cp $(BASEDIR)/extra/* $(OUTPUTDIR)/; fi
 
 publish:
 	$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS)
 	if test -d $(BASEDIR)/extra; then cp $(BASEDIR)/extra/* $(OUTPUTDIR)/; fi
 
-devserver: publish
+devserver: regenerate
 	$(PELICAN) --listen
 
 cleanbranches:
diff --git a/content/devopsdaysyyj.md b/content/devopsdaysyyj.md
@@ -114,4 +114,4 @@ in Victoria.
 Tomorrow conference season continues for me as I'll be attending the 7th annual
 Polyglot Unconference in Vancouver, a favourite event of mine.  I'll likely blog about what
 I see there, but you can also read about what I've seen in prior years in my posts from
-prior years [here]({static}/polyglotconf-2012.md) and [here]({filename}/polyglotconf-2017.md).
+prior years [here]({filename}/polyglotconf-2012.md) and [here]({filename}/polyglotconf-2017.md).
diff --git a/content/pages/gear.md b/content/pages/gear.md
@@ -258,4 +258,4 @@ Ok, so this was a bit playful, but honestly, I take a bit of pride in not spendi
 gear I use.  Often people in tech can be caught up with the latest & greatest (and most expensive),
 but you can do a lot with not a ton of money.
 
-In any case, there you have it, some of the gear I use.  Did I miss anything? [Lemme know]({static}contact.md)
+In any case, there you have it, some of the gear I use.  Did I miss anything? [Lemme know]({filename}contact.md)
diff --git a/content/polyglotconf-2018.md b/content/polyglotconf-2018.md
@@ -6,8 +6,8 @@ tags: polyglotconf,conferences,learning
 cover: static/imgs/polyglotconflogo.png
 summary: I got to go back yet again for the 7th Annual Polyglot Unconference in Vancouver.  Let's recap.
 
-This year, like many past years (see [here]({static}/polyglotconf-2012.md) and
-[here]({static}/polyglotconf-2017.md)), I was fortunate enough to be able to make the trip to
+This year, like many past years (see [here]({filename}/polyglotconf-2012.md) and
+[here]({filename}/polyglotconf-2017.md)), I was fortunate enough to be able to make the trip to
 YVR for the annual [Polyglot Unconference](https://www.polyglotconf.com).  This event, now
 in it's 7th year, has been a favourite of mine for some time as it's a great (and very
 affordable) opportunity to network with a bunch of other technologists, hear about new
diff --git a/content/serverless-microservices-with-python-p2.md b/content/serverless-microservices-with-python-p2.md
@@ -3,7 +3,7 @@ Date: 2017-07-28 10:20
 tags: lambda,serverless,microservices,aws,python
 cover: static/imgs/python-logo-master-v3-TM.png
 
-Ok, so in [part 1]({static}/serverless-microservices-with-python-p1.md) of this series, I started off by exploring the
+Ok, so in [part 1]({filename}/serverless-microservices-with-python-p1.md) of this series, I started off by exploring the
 use of [Lambda](https://aws.amazon.com/lambda/) and
 [API Gateway](https://aws.amazon.com/api-gateway/) as a tool for building scalable microservices in Python. I largely
 focussed on taking an existing tutorial, and building out some unit tests for it, as well as some supplementary scripts
diff --git a/content/stotd-bash-select-part-deux.md b/content/stotd-bash-select-part-deux.md
@@ -12,7 +12,7 @@ summary: Shell Tip Of the Day - Interactively deleting Docker images with Bash's
 ([source](https://devrant.com/rants/752222/if-all-you-have-is-a-hammer-everything-looks-like-a-nail-this-was-something-whic))
 
 Sometimes when you learn about a hammer, everything looks like a nail....  In
-[a previous tip]({static}/stotd-select-untracked-files.md) I showed off using
+[a previous tip]({filename}/stotd-select-untracked-files.md) I showed off using
 Bash's `select` statement to interactively select untracked files in a Git repo.
 
 Today I found another use for the `select` statement -- deleting local Docker
@@ -93,7 +93,7 @@ Dissecting the clunky argument to `docker rmi`: `awk -F'--' '{print $1}'` splits
 the input string on a double dash and then prints just the first column (the ID
 in our case).  We then just echo it back to `docker rmi`.  This works, and I
 tweeted it at Eric Promislow who was the person who demoed
-[the select statement at Polyglot this year]({static}/polyglotconf-2018.md)
+[the select statement at Polyglot this year]({filename}polyglotconf-2018.md)
 which was where I first saw the trick:
 
 <!-- markdownlint-disable MD033 -->
diff --git a/content/stotd-select-untracked-files.md b/content/stotd-select-untracked-files.md
@@ -7,7 +7,7 @@ cover: static/imgs/logos/Gnu-bash-logo-crunch.png
 summary: Shell Tip Of the Day - Selecting untracked files
 
 Today's tip of the day is a follow up from something I learned at
-[this year's Polyglot UnConference]({static}/polyglotconf-2018.md) -- how
+[this year's Polyglot UnConference]({filename}/polyglotconf-2018.md) -- how
 to use ```select``` with the Bash shell for interactive goodness.
 
 At Polyglot I saw an example that looked like this:
