From 04dc419ad49b704a0ce72f70b5853aa8bb881d4d Mon Sep 17 00:00:00 2001
From: kingdonb <3286998+kingdonb@users.noreply.github.com>
Date: Thu, 7 Mar 2024 09:24:33 -0500
Subject: [PATCH 1/3] Update KUBECON.md

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: Kingdon P Barrett <kingdon@tuesdaystudios.com>
---
 KUBECON.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/KUBECON.md b/KUBECON.md
index c5d7e7cf..d345f323 100644
--- a/KUBECON.md
+++ b/KUBECON.md
@@ -79,9 +79,3 @@ Friday, March 22, 2024
 Flux (and Flagger) is a set of continuous and progressive delivery solutions for Kubernetes that are open and extensible. It is the GitOps engine for Microsoft's Arc Kubernetes, AWS's EKS-Anywhere, GitLab, as well as enterprise companies such as telcos, financial institutions, and more.
 
 Flux is a CNCF graduated project and is General Availability.
-
-Get started: [https://fluxcd.io](https://fluxcd.io)
-
-Get help: [https://fluxcd.io/support/](https://fluxcd.io/support/)
-
-Add yourself! [https://fluxcd.io/adopters/](https://fluxcd.io/adopters/)

From 0ea0a3c94115fe7938b2a7374b6a11175aed7749 Mon Sep 17 00:00:00 2001
From: Kingdon P Barrett <kingdon@tuesdaystudios.com>
Date: Thu, 7 Mar 2024 09:24:36 -0500
Subject: [PATCH 2/3] Revert "fix script again, test script"

This reverts commit c9de4166b035d851f84eed140666cfe9b37ecbce.

Signed-off-by: Kingdon P Barrett <kingdon@tuesdaystudios.com>
---
 KUBECON.md               | 7 ++++++-
 script/update-kubecon.sh | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/KUBECON.md b/KUBECON.md
index d345f323..d00a18ac 100644
--- a/KUBECON.md
+++ b/KUBECON.md
@@ -29,8 +29,13 @@ KubeCon Paris 2024 Press release (coming soon!)
 {{< figure src="/img/flux-cuttlefish-stickers.jpeg" alt="Custom printed stickers with cuttlefish mascot and Flux logos" >}}
 </div>
 
+# Flux Booth fun!
 
-<div class="float-booth-fun"><h1>Flux Booth fun!</h1><p>Want a bespoke unique all-your-own cuttlefish sticker?</p><p>Complete the challenge and pick up a human-intelligence or artificial-intelligence Flux sticker!</p><p>Challenge = Deploy <a href="https://github.com/stefanprodan/podinfo">the podinfo sample app</a> and change the text to something like "Cuttlefish playing tennis" and then come by the Flux booth at KubeCon for your bespoke sticker! 😸👩🏻‍🎨🎨</p></div></div>
+Want a bespoke unique all-your-own cuttlefish sticker?
+
+Complete the challenge and pick up a human-intelligence or artificial-intelligence Flux sticker!
+
+Challenge = Deploy <a href="https://github.com/stefanprodan/podinfo">the podinfo sample app</a> and change the text to something like "Cuttlefish playing tennis" and then come by the Flux booth at KubeCon for your bespoke sticker! 😸👩🏻‍🎨🎨
 
 # Flux talks @ KubeCon Paris!
 
diff --git a/script/update-kubecon.sh b/script/update-kubecon.sh
index e00f73a8..7e53b95d 100755
--- a/script/update-kubecon.sh
+++ b/script/update-kubecon.sh
@@ -33,7 +33,7 @@ fi
 # sed 8: flux booth fun (a caption with a heading h1 followed by three paragraphs!)
 # sed 9: the podinfo sample app link is in an HTML block so :( turn it manually into a link
 wget ${SOURCE_SITE} -O ${TEMP_FILE} \
-  && ${HTML2MD_BIN} -i ${TEMP_FILE} |$sed '1,6d'|$head -n -19 \
+  && ${HTML2MD_BIN} -i ${TEMP_FILE} |$sed '1,6d'|$head -n -13 \
   | $sed 's_# \[Copy heading link\](\\#h\.[a-z0-9]*)[[:space:]]*_# _' \
   | $sed 's_/view/flux-kubecon-paris-2024/home_/kubecon_' \
   | $sed -E 's_\[!\[\]\([^)]+\)_[_g' \

From 9a164fab0fe149fc8d6f3b113ad54c81caec661a Mon Sep 17 00:00:00 2001
From: Kingdon P Barrett <kingdon@tuesdaystudios.com>
Date: Thu, 7 Mar 2024 09:24:40 -0500
Subject: [PATCH 3/3] Darwin users are running locally

We can be sure that Darwin users have access to a Go compiler and can
set ~/go/bin in their PATH.

(This script should not be a pain for Linux users to debug either, but
they can set DEBUG=1 to get the same behavior as Darwin users.)

Signed-off-by: Kingdon P Barrett <kingdon@tuesdaystudios.com>
---
 .github/workflows/update-kubecon.yaml |  6 +-----
 KUBECON.md                            | 13 +++++++------
 script/update-kubecon.sh              | 17 ++++++++++++-----
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/update-kubecon.yaml b/.github/workflows/update-kubecon.yaml
index 9ff8ac21..af05e3e8 100644
--- a/.github/workflows/update-kubecon.yaml
+++ b/.github/workflows/update-kubecon.yaml
@@ -14,11 +14,7 @@ jobs:
       - name: Pull html from site and convert to markdown
         run: |
           # go install github.com/suntong/html2md@latest
-          HTML2MD=html2md_1.5.0_linux_amd64
-          HTML2MD_VER=v1.5.0
-          HTML2MD_BIN="./${HTML2MD}/html2md"
-          SOURCE_SITE="https://sites.google.com/view/flux-kubecon-paris-2024/home"
-          export SOURCE_SITE HTML2MD_BIN HTML2MD_VER HTML2MD
+          # export SOURCE_SITE HTML2MD_BIN HTML2MD_VER HTML2MD
 
           ./script/update-kubecon.sh
 
diff --git a/KUBECON.md b/KUBECON.md
index d00a18ac..c5d7e7cf 100644
--- a/KUBECON.md
+++ b/KUBECON.md
@@ -29,13 +29,8 @@ KubeCon Paris 2024 Press release (coming soon!)
 {{< figure src="/img/flux-cuttlefish-stickers.jpeg" alt="Custom printed stickers with cuttlefish mascot and Flux logos" >}}
 </div>
 
-# Flux Booth fun!
 
-Want a bespoke unique all-your-own cuttlefish sticker?
-
-Complete the challenge and pick up a human-intelligence or artificial-intelligence Flux sticker!
-
-Challenge = Deploy <a href="https://github.com/stefanprodan/podinfo">the podinfo sample app</a> and change the text to something like "Cuttlefish playing tennis" and then come by the Flux booth at KubeCon for your bespoke sticker! 😸👩🏻‍🎨🎨
+<div class="float-booth-fun"><h1>Flux Booth fun!</h1><p>Want a bespoke unique all-your-own cuttlefish sticker?</p><p>Complete the challenge and pick up a human-intelligence or artificial-intelligence Flux sticker!</p><p>Challenge = Deploy <a href="https://github.com/stefanprodan/podinfo">the podinfo sample app</a> and change the text to something like "Cuttlefish playing tennis" and then come by the Flux booth at KubeCon for your bespoke sticker! 😸👩🏻‍🎨🎨</p></div></div>
 
 # Flux talks @ KubeCon Paris!
 
@@ -84,3 +79,9 @@ Friday, March 22, 2024
 Flux (and Flagger) is a set of continuous and progressive delivery solutions for Kubernetes that are open and extensible. It is the GitOps engine for Microsoft's Arc Kubernetes, AWS's EKS-Anywhere, GitLab, as well as enterprise companies such as telcos, financial institutions, and more.
 
 Flux is a CNCF graduated project and is General Availability.
+
+Get started: [https://fluxcd.io](https://fluxcd.io)
+
+Get help: [https://fluxcd.io/support/](https://fluxcd.io/support/)
+
+Add yourself! [https://fluxcd.io/adopters/](https://fluxcd.io/adopters/)
diff --git a/script/update-kubecon.sh b/script/update-kubecon.sh
index 7e53b95d..9110de57 100755
--- a/script/update-kubecon.sh
+++ b/script/update-kubecon.sh
@@ -1,10 +1,11 @@
 #!/bin/bash
 # Define and export these (ahead of the script):
 #
-# HTML2MD=html2md_1.5.0_linux_amd64
-# HTML2MD_VER=v1.5.0
-# HTML2MD_BIN="./${HTML2MD}/html2md"
-# SOURCE_SITE="https://sites.google.com/view/flux-kubecon-paris-2024/home"
+HTML2MD_VER=1.5.0
+HTML2MD=html2md_${HTML2MD_VER}_linux_amd64
+HTML2MD_VER_SLUG=v${HTML2MD_VER}
+HTML2MD_BIN="./${HTML2MD}/html2md"
+SOURCE_SITE="https://sites.google.com/view/flux-kubecon-paris-2024/home"
 # export SOURCE_SITE HTML2MD_BIN HTML2MD_VER HTML2MD
 
 TEMP_FILE=kubecon.html
@@ -16,13 +17,19 @@ head=head
 if [[ "$OSTYPE" == "darwin"* ]]; then
   sed=gsed
   head=ghead
+  DEBUG=1
 fi
 
 if [[ -z "$DEBUG" ]]; then
-  wget https://github.com/suntong/html2md/releases/download/${HTML2MD_VER}/${HTML2MD}.tar.gz -O ${HTML2MD}.tar.gz
+  wget https://github.com/suntong/html2md/releases/download/${HTML2MD_VER_SLUG}/${HTML2MD}.tar.gz -O ${HTML2MD}.tar.gz
   tar xvf ${HTML2MD}.tar.gz
 else
   HTML2MD_BIN=`which html2md`
+  if [[ -z "$HTML2MD_BIN" ]]; then
+    echo "Run: go install github.com/suntong/html2md@latest and ensure that ~/go/bin/ is in PATH"
+    echo "    Fatal error: html2md was not installed"
+    exit 1
+  fi
 fi
 
 # sed 1: Remove "Copy heading link" text, which is inserted by Google Site