From 44f79a70cd950c19fe635052729235c699d47625 Mon Sep 17 00:00:00 2001
From: Chris Coley <chris@codingallnight.com>
Date: Thu, 20 Jun 2024 10:33:11 -0700
Subject: [PATCH] Remove trailing slash from %%BASE_URL%% and add it explicitly
when needed
---
.gitlab-ci.yml | 2 +-
src/cache-test.html | 3 +--
src/index.html | 3 +--
src/sitemap.xml | 6 +++---
src/sub/index.html | 3 +--
5 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ebe8224..eb338ca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,7 +41,7 @@ setup:
- find src/ -type f \( -iname '*.html' -or -iname 'sitemap.xml' \)
-exec sed -i
-e "s|%%BRANCH%%|${CI_COMMIT_BRANCH}|g"
- -e "s|%%BASE_URL%%|${CI_PAGES_URL}/|g"
+ -e "s|%%BASE_URL%%|${CI_PAGES_URL}|g"
-e "s|%%COMMIT_SHA%%|${CI_COMMIT_SHORT_SHA}|g"
-e "s|%%COMMIT_TIMESTAMP%%|${CI_COMMIT_TIMESTAMP}|g"
-e "s|%%JOB_ID%%|${CI_JOB_ID}|g"
diff --git a/src/cache-test.html b/src/cache-test.html
index 0391a3b..91563ff 100644
--- a/src/cache-test.html
+++ b/src/cache-test.html
@@ -2,10 +2,9 @@
<html lang="en">
<head>
<meta charset="utf-8">
- <base href="%%BASE_URL%%">
+ <base href="%%BASE_URL%%/">
<title>Cache Test | %%PROJECT_TITLE%%</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
- <meta name="generator" content="GitLab Pages">
<link rel="shortcut icon" href="gitlab-favicon.png">
<link rel="canonical" href="cache-test.html">
<link rel="preload" href="style.css" as="style">
diff --git a/src/index.html b/src/index.html
index 20e3651..89f2c76 100644
--- a/src/index.html
+++ b/src/index.html
@@ -2,10 +2,9 @@
<html lang="en">
<head>
<meta charset="utf-8">
- <base href="%%BASE_URL%%">
+ <base href="%%BASE_URL%%/">
<title>%%PROJECT_TITLE%%</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
- <meta name="generator" content="GitLab Pages">
<link rel="shortcut icon" href="gitlab-favicon.png">
<link rel="canonical" href="./">
<link rel="preload" href="style.css" as="style">
diff --git a/src/sitemap.xml b/src/sitemap.xml
index c9aa532..94662bc 100644
--- a/src/sitemap.xml
+++ b/src/sitemap.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url>
- <loc>%%BASE_URL%%</loc>
+ <loc>%%BASE_URL%%/</loc>
</url>
<url>
- <loc>%%BASE_URL%%cache-test.html</loc>
+ <loc>%%BASE_URL%%/cache-test.html</loc>
</url>
<url>
- <loc>%%BASE_URL%%sub/</loc>
+ <loc>%%BASE_URL%%/sub/</loc>
</url>
</urlset>
<!-- vi: set ts=2 sw=2 et ft=xml: -->
diff --git a/src/sub/index.html b/src/sub/index.html
index f48ebcd..0789dee 100644
--- a/src/sub/index.html
+++ b/src/sub/index.html
@@ -2,10 +2,9 @@
<html lang="en">
<head>
<meta charset="utf-8">
- <base href="%%BASE_URL%%">
+ <base href="%%BASE_URL%%/">
<title>Subdirectory | %%PROJECT_TITLE%%</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
- <meta name="generator" content="GitLab Pages">
<link rel="shortcut icon" href="gitlab-favicon.png">
<link rel="canonical" href="sub/">
<link rel="preload" href="style.css" as="style">
--
GitLab