From d240678e9a2c2736fc0ceb653aa9b354cc6b036a Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Sun, 16 Aug 2020 11:27:33 +0200 Subject: [PATCH 1/5] Fixing use of env vars --- build-site.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-site.sh b/build-site.sh index 7b4a8460b184..635938132e54 100755 --- a/build-site.sh +++ b/build-site.sh @@ -2,7 +2,7 @@ if [[ -z "${DEPLOY_PRIME_URL}" ]]; then USE_BASE_URL_SITE="" - USE_BASE_URL_SITE_DOCS="" + USE_BASE_URL_DOCS="" else echo -e "\033[0;32mNetlify DEPLOY_PRIME_URL detected, this seems to be a PR, deployment happening at ${DEPLOY_PRIME_URL}...\033[0m" USE_BASE_URL_SITE="-b ${DEPLOY_PRIME_URL}" @@ -13,10 +13,10 @@ echo -e "\033[0;32mDeleting Hugo previously generated directories for docs and m rm -rf site_source_files/public && rm -rf docs_source_files/public echo -e "\033[0;32mGenerating Hugo site for docs...\033[0m" -cd docs_source_files && hugo --minify ${URL_BASE_DOCS} && cd .. +cd docs_source_files && hugo --minify ${URL_BASE_URL_DOCS} && cd .. echo -e "\033[0;32mGenerating Hugo site for main website...\033[0m" -cd site_source_files && hugo --minify ${URL_BASE_SITE} && cd .. +cd site_source_files && hugo --minify ${URL_BASE_URL_SITE} && cd .. echo -e "\033[0;32mMerging both sites into a single one...\033[0m" mv docs_source_files/public/* site_source_files/public/documentation From af839932d9f58161008004c67a4aff87789f2387 Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Sun, 16 Aug 2020 11:35:11 +0200 Subject: [PATCH 2/5] Update build-site.sh --- build-site.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-site.sh b/build-site.sh index 635938132e54..5568cad04274 100755 --- a/build-site.sh +++ b/build-site.sh @@ -13,10 +13,10 @@ echo -e "\033[0;32mDeleting Hugo previously generated directories for docs and m rm -rf site_source_files/public && rm -rf docs_source_files/public echo -e "\033[0;32mGenerating Hugo site for docs...\033[0m" -cd docs_source_files && hugo --minify ${URL_BASE_URL_DOCS} && cd .. +cd docs_source_files && hugo --minify ${USE_BASE_URL_DOCS} && cd .. echo -e "\033[0;32mGenerating Hugo site for main website...\033[0m" -cd site_source_files && hugo --minify ${URL_BASE_URL_SITE} && cd .. +cd site_source_files && hugo --minify ${USE_BASE_URL_SITE} && cd .. echo -e "\033[0;32mMerging both sites into a single one...\033[0m" mv docs_source_files/public/* site_source_files/public/documentation From 08c0531f76bcf7f5049974b8e6e291b52697b870 Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Mon, 17 Aug 2020 09:14:39 +0200 Subject: [PATCH 3/5] Add debug statement --- build-site.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build-site.sh b/build-site.sh index 5568cad04274..868adb35b7a2 100755 --- a/build-site.sh +++ b/build-site.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -x if [[ -z "${DEPLOY_PRIME_URL}" ]]; then USE_BASE_URL_SITE="" From 227b518e282d1183af005c74af78a7bcf7825546 Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Mon, 17 Aug 2020 10:22:44 +0200 Subject: [PATCH 4/5] Removing baseURLs per language --- build-site.sh | 6 +++--- docs_source_files/config.toml | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build-site.sh b/build-site.sh index 868adb35b7a2..e23a33d2da27 100755 --- a/build-site.sh +++ b/build-site.sh @@ -2,12 +2,12 @@ set -x if [[ -z "${DEPLOY_PRIME_URL}" ]]; then - USE_BASE_URL_SITE="" + USE_BASE_URL_SITE="" USE_BASE_URL_DOCS="" else echo -e "\033[0;32mNetlify DEPLOY_PRIME_URL detected, this seems to be a PR, deployment happening at ${DEPLOY_PRIME_URL}...\033[0m" - USE_BASE_URL_SITE="-b ${DEPLOY_PRIME_URL}" - USE_BASE_URL_DOCS="-b ${DEPLOY_PRIME_URL}/documentation" + USE_BASE_URL_SITE="--baseURL ${DEPLOY_PRIME_URL}" + USE_BASE_URL_DOCS="--baseURL ${DEPLOY_PRIME_URL}/documentation" fi echo -e "\033[0;32mDeleting Hugo previously generated directories for docs and main site...\033[0m" diff --git a/docs_source_files/config.toml b/docs_source_files/config.toml index dbf5e07e739d..1381d2560514 100644 --- a/docs_source_files/config.toml +++ b/docs_source_files/config.toml @@ -37,7 +37,7 @@ home = [ "HTML", "RSS", "JSON"] title = "Documentation for Selenium" weight = 1 languageName = "English" -baseURL = "https://www.selenium.dev/documentation/en" +#baseURL = "https://www.selenium.dev/documentation/en" [[Languages.en.menu.shortcuts]] name = " Selenium Home" @@ -69,7 +69,7 @@ weight = 30 title = "Documentación de Selenium" weight = 2 languageName = "Español" -baseURL = "https://www.selenium.dev/documentation/es" +#baseURL = "https://www.selenium.dev/documentation/es" [[Languages.es.menu.shortcuts]] name = " Selenium Home" @@ -101,7 +101,7 @@ weight = 30 title = "Selenium documentatie" weight = 3 languageName = "Nederlands" -baseURL = "https://www.selenium.dev/documentation/nl" +#baseURL = "https://www.selenium.dev/documentation/nl" [[Languages.nl.menu.shortcuts]] name = " Selenium Home" @@ -133,7 +133,7 @@ weight = 30 title = "Selenium 文档" weight = 4 languageName = "中文简体" -baseURL = "https://www.selenium.dev/documentation/zh-cn" +#baseURL = "https://www.selenium.dev/documentation/zh-cn" [[Languages.zh-cn.menu.shortcuts]] name = " Selenium Home" @@ -165,7 +165,7 @@ weight = 30 title = "Documentation Selenium" weight = 5 languageName = "Français" -baseURL = "https://www.selenium.dev/documentation/fr" +#baseURL = "https://www.selenium.dev/documentation/fr" [[Languages.fr.menu.shortcuts]] name = " Signaler un problème" @@ -197,7 +197,7 @@ weight = 10 title = "Seleniumドキュメント" weight = 6 languageName = "日本語" -baseURL = "https://www.selenium.dev/documentation/ja" +#baseURL = "https://www.selenium.dev/documentation/ja" [[Languages.ja.menu.shortcuts]] name = " Selenium Home" @@ -229,7 +229,7 @@ weight = 30 title = "Selenium 문서" weight = 7 languageName = "한국어" -baseURL = "https://www.selenium.dev/documentation/ko" +#baseURL = "https://www.selenium.dev/documentation/ko" [[Languages.ko.menu.shortcuts]] name = " Selenium 홈" @@ -261,7 +261,7 @@ weight = 30 title = "Dokumentation für Selenium" weight = 1 languageName = "Deutsch" -baseURL = "https://www.selenium.dev/documentation/de" +#baseURL = "https://www.selenium.dev/documentation/de" [[Languages.de.menu.shortcuts]] name = " Selenium Home" From 16eae387d6fbd4e7225e2f476545d4996ff2d3f7 Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Mon, 17 Aug 2020 10:27:54 +0200 Subject: [PATCH 5/5] Removing unused vars --- docs_source_files/config.toml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/docs_source_files/config.toml b/docs_source_files/config.toml index 1381d2560514..252463d44bee 100644 --- a/docs_source_files/config.toml +++ b/docs_source_files/config.toml @@ -37,7 +37,6 @@ home = [ "HTML", "RSS", "JSON"] title = "Documentation for Selenium" weight = 1 languageName = "English" -#baseURL = "https://www.selenium.dev/documentation/en" [[Languages.en.menu.shortcuts]] name = " Selenium Home" @@ -69,7 +68,6 @@ weight = 30 title = "Documentación de Selenium" weight = 2 languageName = "Español" -#baseURL = "https://www.selenium.dev/documentation/es" [[Languages.es.menu.shortcuts]] name = " Selenium Home" @@ -101,7 +99,6 @@ weight = 30 title = "Selenium documentatie" weight = 3 languageName = "Nederlands" -#baseURL = "https://www.selenium.dev/documentation/nl" [[Languages.nl.menu.shortcuts]] name = " Selenium Home" @@ -133,7 +130,6 @@ weight = 30 title = "Selenium 文档" weight = 4 languageName = "中文简体" -#baseURL = "https://www.selenium.dev/documentation/zh-cn" [[Languages.zh-cn.menu.shortcuts]] name = " Selenium Home" @@ -165,7 +161,6 @@ weight = 30 title = "Documentation Selenium" weight = 5 languageName = "Français" -#baseURL = "https://www.selenium.dev/documentation/fr" [[Languages.fr.menu.shortcuts]] name = " Signaler un problème" @@ -197,7 +192,6 @@ weight = 10 title = "Seleniumドキュメント" weight = 6 languageName = "日本語" -#baseURL = "https://www.selenium.dev/documentation/ja" [[Languages.ja.menu.shortcuts]] name = " Selenium Home" @@ -229,7 +223,6 @@ weight = 30 title = "Selenium 문서" weight = 7 languageName = "한국어" -#baseURL = "https://www.selenium.dev/documentation/ko" [[Languages.ko.menu.shortcuts]] name = " Selenium 홈" @@ -261,7 +254,6 @@ weight = 30 title = "Dokumentation für Selenium" weight = 1 languageName = "Deutsch" -#baseURL = "https://www.selenium.dev/documentation/de" [[Languages.de.menu.shortcuts]] name = " Selenium Home"