From 522039271c4cd3b7dd025e266b7ecfe6b9a11f16 Mon Sep 17 00:00:00 2001 From: John Hess Date: Mon, 17 Jun 2024 20:42:36 -0500 Subject: [PATCH] use language-invariant link to the usb-butter page --- .gitlab-ci.yml | 6 +++++- _config.yml | 1 + index.html | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 316024a..a5a6486 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,6 +17,9 @@ test: except: - butter-box +# This includes 3 separate builds. +# The main one is for the GitLab pages deployment. It includes a simulated USB Butter drive. +# The other two are for the downloadable zips of the site in English and Spanish. pages: stage: deploy script: @@ -35,12 +38,13 @@ pages: - bundle exec jekyll build -d public - cd public - zip -r ../site-es.zip ./ - # Now go build the site we actually want to deploy. - cd .. - git restore . + # Now go build the site we actually want to deploy. # simulate the drive being inserted - mv simulated-usb-butter usb-butter - "sed -i 's/^baseurl.*/baseurl: \"\\/butter-box-ui\"/' _config.yml" + - "sed -i 's/^usb_butter_url.*/usb_butter_url: \"\\/usb-butter\"/' _config.yml" - bundle exec jekyll build -d public # Now move the zip into the public dir so it gets served. - mv ./site-en.zip ./public/site-en.zip diff --git a/_config.yml b/_config.yml index 1a8e669..4d80e37 100644 --- a/_config.yml +++ b/_config.yml @@ -2,6 +2,7 @@ title: Butter | Life without internet made smoother. description: >- # this means to ignore newlines until "baseurl:" Life without internet made smoother. Get access to tools that help. baseurl: "" # the subpath of your site, e.g. /blog +usb_butter_url: "/usb-butter" # the language-invariant location of the USB Butter page url: "" # the base hostname & protocol for your site, e.g. http://example.com twitter_username: Butter App github_username: Butter App diff --git a/index.html b/index.html index f7cb03d..1336fe7 100644 --- a/index.html +++ b/index.html @@ -7,7 +7,7 @@ layout: default
-