Skip to content

Commit b10466d

Browse files
authored
Merge pull request #843 from rstudio/dev
Merge fix for broken `sed` command on MacOS
2 parents 73ee692 + 2066dab commit b10466d

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

Justfile

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,10 @@ update-rsw-versions:
305305
sed {{ sed_vars }} "s/[0-9]\{4\}\.[0-9]\{1,2\}\.[0-9]\{1,2\}/`just _get-clean-version {{ RSW_VERSION }}`/g" \
306306
workbench/README.md \
307307
r-session-complete/README.md
308-
sed -i '/variable WORKBENCH_VERSION/!b;n;c\ \ \ \ default = "{{ RSW_VERSION }}"' docker-bake.hcl
308+
awk -v new_version="{{ RSW_VERSION }}" '
309+
/variable WORKBENCH_VERSION/ { print; getline; print " default = \"" new_version "\""; next }
310+
{ print }
311+
' docker-bake.hcl > file.tmp && mv file.tmp docker-bake.hcl
309312

310313
# just RSPM_VERSION=1.2.3 update-rspm-versions
311314
update-rspm-versions:
@@ -320,7 +323,10 @@ update-rspm-versions:
320323
package-manager/Justfile \
321324
Justfile
322325
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
323-
sed -i '/variable PACKAGE_MANAGER_VERSION/!b;n;c\ \ \ \ default = "{{ RSPM_VERSION }}"' docker-bake.hcl
326+
awk -v new_version="{{ RSPM_VERSION }}" '
327+
/variable PACKAGE_MANAGER_VERSION/ { print; getline; print " default = \"" new_version "\""; next }
328+
{ print }
329+
' docker-bake.hcl > file.tmp && mv file.tmp docker-bake.hcl
324330

325331
# just RSC_VERSION=1.2.3 update-rsc-versions
326332
update-rsc-versions:
@@ -335,7 +341,10 @@ update-rsc-versions:
335341
sed {{ sed_vars }} -E "s/[0-9]{4}\.[0-9]{1,2}\.[0-9]{1,2}/`just _get-clean-version {{ RSC_VERSION }}`/g" \
336342
connect/README.md \
337343
connect-content-init/README.md
338-
sed -i '/variable CONNECT_VERSION/!b;n;c\ \ \ \ default = "{{ RSC_VERSION }}"' docker-bake.hcl
344+
awk -v new_version="{{ RSC_VERSION }}" '
345+
/variable CONNECT_VERSION/ { print; getline; print " default = \"" new_version "\""; next }
346+
{ print }
347+
' docker-bake.hcl > file.tmp && mv file.tmp docker-bake.hcl
339348

340349
# just R_VERSION=3.2.1 R_VERSION_ALT=4.1.0 update-r-versions
341350
update-r-versions: update-default-r-versions

0 commit comments

Comments
 (0)