From 78b507757a7b0f7c5f62d733f9e10c32268f0fb1 Mon Sep 17 00:00:00 2001
From: Pablo Bianco Lascaray <pablo@rstudio.com>
Date: Fri, 6 Sep 2024 16:45:11 -0400
Subject: [PATCH 1/2] Replaced broken sed command (on macs) with ed
 alternative.

---
 Justfile | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Justfile b/Justfile
index fc43e484f..92de65f50 100644
--- a/Justfile
+++ b/Justfile
@@ -335,7 +335,14 @@ update-rsc-versions:
   sed {{ sed_vars }} -E "s/[0-9]{4}\.[0-9]{1,2}\.[0-9]{1,2}/`just _get-clean-version {{ RSC_VERSION }}`/g" \
     connect/README.md \
     connect-content-init/README.md
-  sed -i '/variable CONNECT_VERSION/!b;n;c\ \ \ \ default = "{{ RSC_VERSION }}"' docker-bake.hcl
+  ed -s docker-bake.hcl <<EOF
+  /variable CONNECT_VERSION/
+  +1c
+      default = "{{ RSC_VERSION }}"
+  .
+  w
+  q
+  EOF
 
 # just R_VERSION=3.2.1 R_VERSION_ALT=4.1.0 update-r-versions
 update-r-versions: update-default-r-versions

From 2d5d7acae863361b6e465c664b82fe0d07753fdf Mon Sep 17 00:00:00 2001
From: Pablo Bianco Lascaray <pablo@rstudio.com>
Date: Mon, 23 Sep 2024 08:28:24 -0400
Subject: [PATCH 2/2] Made changes for all products.

---
 Justfile | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/Justfile b/Justfile
index 92de65f50..ef75c734f 100644
--- a/Justfile
+++ b/Justfile
@@ -305,7 +305,10 @@ update-rsw-versions:
   sed {{ sed_vars }} "s/[0-9]\{4\}\.[0-9]\{1,2\}\.[0-9]\{1,2\}/`just _get-clean-version {{ RSW_VERSION }}`/g" \
     workbench/README.md \
     r-session-complete/README.md
-  sed -i '/variable WORKBENCH_VERSION/!b;n;c\ \ \ \ default = "{{ RSW_VERSION }}"' docker-bake.hcl
+  awk -v new_version="{{ RSW_VERSION }}" '
+  /variable WORKBENCH_VERSION/ { print; getline; print "    default = \"" new_version "\""; next }
+  { print }
+  ' docker-bake.hcl > file.tmp && mv file.tmp docker-bake.hcl
 
 # just RSPM_VERSION=1.2.3 update-rspm-versions
 update-rspm-versions:
@@ -320,7 +323,10 @@ update-rspm-versions:
     package-manager/Justfile \
     Justfile
   sed {{ sed_vars }} -E "s/[0-9]{4}\.[0-9]{1,2}\.[0-9]{1,2}/`just _get-clean-version {{ RSPM_VERSION }}`/g" package-manager/README.md
-  sed -i '/variable PACKAGE_MANAGER_VERSION/!b;n;c\ \ \ \ default = "{{ RSPM_VERSION }}"' docker-bake.hcl
+  awk -v new_version="{{ RSPM_VERSION }}" '
+  /variable PACKAGE_MANAGER_VERSION/ { print; getline; print "    default = \"" new_version "\""; next }
+  { print }
+  ' docker-bake.hcl > file.tmp && mv file.tmp docker-bake.hcl
 
 # just RSC_VERSION=1.2.3 update-rsc-versions
 update-rsc-versions:
@@ -335,14 +341,10 @@ update-rsc-versions:
   sed {{ sed_vars }} -E "s/[0-9]{4}\.[0-9]{1,2}\.[0-9]{1,2}/`just _get-clean-version {{ RSC_VERSION }}`/g" \
     connect/README.md \
     connect-content-init/README.md
-  ed -s docker-bake.hcl <<EOF
-  /variable CONNECT_VERSION/
-  +1c
-      default = "{{ RSC_VERSION }}"
-  .
-  w
-  q
-  EOF
+  awk -v new_version="{{ RSC_VERSION }}" '
+  /variable CONNECT_VERSION/ { print; getline; print "    default = \"" new_version "\""; next }
+  { print }
+  ' docker-bake.hcl > file.tmp && mv file.tmp docker-bake.hcl
 
 # just R_VERSION=3.2.1 R_VERSION_ALT=4.1.0 update-r-versions
 update-r-versions: update-default-r-versions