From 0fee4d54703218a193ded86d347dc217b3a4000b Mon Sep 17 00:00:00 2001
From: CyrilFerlicot <cyril@ferlicot.fr>
Date: Wed, 26 Nov 2025 17:19:28 +0100
Subject: [PATCH 1/2] Load the right tonel version during the bootstrap

Up to now the tonel version was hardcoded in the scripts. We forgot to update it in P13 and P14. I propose to not hardcode the version
---
 bootstrap/scripts/4-build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap/scripts/4-build.sh b/bootstrap/scripts/4-build.sh
index a4e6c7c9f9f..eb5c36ce928 100755
--- a/bootstrap/scripts/4-build.sh
+++ b/bootstrap/scripts/4-build.sh
@@ -192,7 +192,7 @@ zip "${MC_IMAGE_NAME}.zip" ${MC_IMAGE_NAME}.*
 echo "[Metacello] Bootstrapping Metacello"
 ${VM} "${MC_IMAGE_NAME}.image" save ${METACELLO_IMAGE_NAME}
 ${VM} "${METACELLO_IMAGE_NAME}.image" st ${BOOTSTRAP_REPOSITORY}/bootstrap/scripts/03-metacello-bootstrap/01-loadMetacello.st --save --quit
-${VM} "${METACELLO_IMAGE_NAME}.image" metacello install --save --signalErrorOnWarning 'github://pharo-vcs/tonel:Pharo12' Tonel --groups core
+${VM} "${METACELLO_IMAGE_NAME}.image" metacello install --save --signalErrorOnWarning 'github://pharo-vcs/tonel:Pharo${PHARO_MAJOR}' Tonel --groups core
 zip "${METACELLO_IMAGE_NAME}.zip" ${METACELLO_IMAGE_NAME}.*
 
 echo $(date -u) "[Pharo] Reloading rest of packages"

From 83c5b81086b14a5f2ccef655b5b844b14b7a3f15 Mon Sep 17 00:00:00 2001
From: CyrilFerlicot <cyril@ferlicot.fr>
Date: Wed, 26 Nov 2025 17:42:19 +0100
Subject: [PATCH 2/2] Use double quotes for variables

---
 bootstrap/scripts/4-build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap/scripts/4-build.sh b/bootstrap/scripts/4-build.sh
index eb5c36ce928..6ac5ec09e00 100755
--- a/bootstrap/scripts/4-build.sh
+++ b/bootstrap/scripts/4-build.sh
@@ -192,7 +192,7 @@ zip "${MC_IMAGE_NAME}.zip" ${MC_IMAGE_NAME}.*
 echo "[Metacello] Bootstrapping Metacello"
 ${VM} "${MC_IMAGE_NAME}.image" save ${METACELLO_IMAGE_NAME}
 ${VM} "${METACELLO_IMAGE_NAME}.image" st ${BOOTSTRAP_REPOSITORY}/bootstrap/scripts/03-metacello-bootstrap/01-loadMetacello.st --save --quit
-${VM} "${METACELLO_IMAGE_NAME}.image" metacello install --save --signalErrorOnWarning 'github://pharo-vcs/tonel:Pharo${PHARO_MAJOR}' Tonel --groups core
+${VM} "${METACELLO_IMAGE_NAME}.image" metacello install --save --signalErrorOnWarning "github://pharo-vcs/tonel:Pharo${PHARO_MAJOR}" Tonel --groups core
 zip "${METACELLO_IMAGE_NAME}.zip" ${METACELLO_IMAGE_NAME}.*
 
 echo $(date -u) "[Pharo] Reloading rest of packages"