Commit ffb0bd3
build, tools: drop leading / from r2dir
The script is commented as removing `/home/dist/` part but the `cut`
command is off by one and end up including the `/` character (so that
the resulting string starts with `/`). When this is substituted into
`s3://${cloudflare_bucket}/${r2dir}/${shafile}.asc` we end up with
`//` (one from the template and one from the `r2dir`) which appears
to cause Cloudflare to create an extra top level `/` directory in the
bucket.
PR-URL: #53951
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent e6ba121 commit ffb0bd3
1 file changed
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -158,7 +158,7 @@ sign() { | |||
| 158 | 158 | # since the promotion script should take care of uploading them. | |
| 159 | 159 | ||
| 160 | 160 | # Remove /home/dist/ part | |
| 161 | - r2dir=$(echo "$shadir" | cut -c 11-) | ||
| 161 | + r2dir=$(echo "$shadir" | cut -c 12-) | ||
| 162 | 162 | ||
| 163 | 163 | # Copy SHASUMS256.txt.asc | |
| 164 | 164 | # shellcheck disable=SC2086,SC2029 | |
0 commit comments