From 946a09d3555ec54de76ce415e9b88cb6e890bdc4 Mon Sep 17 00:00:00 2001
From: Timothy Flynn <trflynn89@pm.me>
Date: Sat, 22 Jun 2024 11:52:25 -0400
Subject: [PATCH] Meta: Re-bootstrap vcpkg when we update its version

Fetching package versions that were shipped after vcpkg was last
bootstrapped requires re-bootstrapping vcpkg.
---
 Meta/ladybird.sh        |  6 +-----
 Toolchain/BuildVcpkg.sh | 12 +++++++++++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Meta/ladybird.sh b/Meta/ladybird.sh
index 04a2369ed7..a2cf28a682 100755
--- a/Meta/ladybird.sh
+++ b/Meta/ladybird.sh
@@ -127,7 +127,6 @@ build_cmake() {
 }
 
 build_vcpkg() {
-    echo "Building vcpkg"
     ( cd "$LADYBIRD_SOURCE_DIR/Toolchain" && ./BuildVcpkg.sh )
 }
 
@@ -136,10 +135,7 @@ ensure_toolchain() {
         build_cmake
     fi
 
-    # FIXME: Add a version check if needed.
-    if [ ! -x "${LADYBIRD_SOURCE_DIR}/Toolchain/Local/vcpkg/bin/vcpkg" ]; then
-        build_vcpkg
-    fi
+    build_vcpkg
 }
 
 run_gdb() {
diff --git a/Toolchain/BuildVcpkg.sh b/Toolchain/BuildVcpkg.sh
index dd899dbd50..4f64b35f4d 100755
--- a/Toolchain/BuildVcpkg.sh
+++ b/Toolchain/BuildVcpkg.sh
@@ -26,7 +26,17 @@ PREFIX_DIR="$DIR/Local/vcpkg"
 
 mkdir -p "$DIR/Tarballs"
 pushd "$DIR/Tarballs"
-    [ ! -d vcpkg ] && git clone $GIT_REPO
+    if [[ ! -d vcpkg ]]; then
+        git clone "${GIT_REPO}"
+    else
+        bootstrapped_vcpkg_version=$(git -C vcpkg rev-parse HEAD)
+
+        if [[ "${bootstrapped_vcpkg_version}" == "${GIT_REV}" ]]; then
+            exit 0
+        fi
+    fi
+
+    echo "Building vcpkg"
 
     cd vcpkg
     git fetch origin