diff options
| -rwxr-xr-x | build.sh | 4 | ||||
| -rwxr-xr-x | deploy.sh | 10 | ||||
| -rw-r--r-- | index.csv | 1 | ||||
| -rw-r--r-- | posts/adieu-quake.md | 2 | ||||
| -rw-r--r-- | posts/index.md | 5 | ||||
| -rw-r--r-- | posts/opening-black-boxes.md | 2 |
6 files changed, 14 insertions, 10 deletions
@@ -7,9 +7,9 @@ cd posts for f in *.md do - pandoc --email-obfuscation=javascript --mathjax -s -t html --css=/style.css -B ../header.inc -A ../footer.inc --metadata pagetitle="FWEI.TK | ""$(../extract_field.sh ../index.csv $f 2)" -o ../blog-staging/${f%.md}.html $f + pandoc --email-obfuscation=javascript --mathjax -s -t html --css=/style.css -B ../header.inc -A ../footer.inc --metadata pagetitle="Franklin Wei | ""$(../extract_field.sh ../index.csv $f 2)" -o ../blog-staging/${f%.md}.html $f done cd - -cp files/* blog-staging/ +cp -r files/* blog-staging/ @@ -1,5 +1,7 @@ #!/bin/bash +HOST=do + if [ $(ssh-add -l | grep SHA | wc -l) -lt 1 ] then ssh-add @@ -9,15 +11,15 @@ fi echo "Copying to staging..." tar -czf blog.tar.gz blog-staging -scp -v blog.tar.gz root@fwei.tk: -ssh -v root@fwei.tk "rm -rf /var/www/html/blog-staging ; tar -xzvf blog.tar.gz -C /var/www/html" +scp -v blog.tar.gz root@"$HOST": +ssh -v root@"$HOST" "rm -rf /var/www/html/blog-staging ; tar -xzvf blog.tar.gz -C /var/www/html" rm -f blog.tar.gz if [[ $# -ge 1 ]] && [[ $1 == "-p" ]] then echo "Going gold..." - ssh root@fwei.tk rm -rf /var/www/html/blog - ssh root@fwei.tk mv /var/www/html/blog-staging /var/www/html/blog + ssh root@"$HOST" rm -rf /var/www/html/blog + ssh root@"$HOST" mv /var/www/html/blog-staging /var/www/html/blog echo "Moved to production." else echo "Files copied to staging site." @@ -3,3 +3,4 @@ opening-black-boxes.md_On Opening Black Boxes or: How I Learned to Stop Worrying single-use-ssh-keys.md_Single-Use SSH Keys a-c-programmer-learns-javascript.md_A C Programmer Learns Javascript: Making RasterCarve index.md_Quite Frankly +miters-hlv-lathe-repair.md_Cracked Iron and Redemption: A Tale of the MITERS Hardinge HLV Lathe diff --git a/posts/adieu-quake.md b/posts/adieu-quake.md index cc7a451..bb16171 100644 --- a/posts/adieu-quake.md +++ b/posts/adieu-quake.md @@ -4,7 +4,7 @@ <center> <figure> -[{height=300}](https://www.youtube.com/watch?v=74i8aBOmyos)\ {height=300} +[{height=300}](https://www.youtube.com/watch?v=r6V-4AZ7pkA)\ {height=300} <figcaption>Quake running on an iPod Classic.</figcaption> </figure> </center> diff --git a/posts/index.md b/posts/index.md index 6549f1c..c6c9a65 100644 --- a/posts/index.md +++ b/posts/index.md @@ -4,11 +4,12 @@ This is my humble blog. Welcome. +- [Cracked Iron and Redemption: A Tale of the MITERS Hardinge HLV Lathe](miters-hlv-lathe-repair.html) (23 May 2025) - [A C Programmer Learns Javascript: Making RasterCarve](a-c-programmer-learns-javascript.html) (4 Jan 2020) - [On Opening Black Boxes or: How I Learned to Stop Worrying and Love G-Code](opening-black-boxes.html) (28 Nov 2019) - [Adieu, Quake!](adieu-quake.html) (27 Aug 2019) - [Single-Use SSH Keys](single-use-ssh-keys.html) (23 Aug 2015) -Contact: <me@fwei.tk> +Contact: <me@franklinwei.com> -This blog is [open-source](https://fwei.tk/git/blog)! +This blog is [open-source](https://www.franklinwei.com/cgit/blog)! diff --git a/posts/opening-black-boxes.md b/posts/opening-black-boxes.md index f776cea..17855b0 100644 --- a/posts/opening-black-boxes.md +++ b/posts/opening-black-boxes.md @@ -67,7 +67,7 @@ Python made things *so* much easier than C (or God forbid -- [ARM assembly](adieu-quake.html#asm-listing)). The heart of my program is a function, -[`engraveLine`](https://fwei.tk/git/rastercarve/tree/src/rastercarve.py?id=c2de4a3258c3e37d4b49a41d786eef936262f137#n118) (below), +[`engraveLine`](https://franklinwei.com/cgit/rastercarve/tree/src/rastercarve.py?id=c2de4a3258c3e37d4b49a41d786eef936262f137#n118) (below), which outputs the G-code to engrave one "groove" across the image. It takes in a initial position vector on the border of the image, and a direction vector telling it which way to cut. |