From cb69c6e84356b2e137d5b27885223a8514c7e802 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Thu, 4 Jan 2024 17:15:41 +0200 Subject: utils: update-mojo.sh: Properly remove old sources The update-mojo.sh script starts by removing all sources before copying the new files from chromium. A bug in the 'rm' command makes the removal a no-op: the glob pattern is quoted, which attempts to remove a file name '*' in the tools directory, not all files in the directory. Fix it by removing the whole utils/ipc/mojo/ directory. While at it, also remove the utils/ipc/tools/ directory that contains imported sources. Signed-off-by: Laurent Pinchart Reviewed-by: Milan Zamazal Reviewed-by: Kieran Bingham Signed-off-by: Kieran Bingham --- utils/update-mojo.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/utils/update-mojo.sh b/utils/update-mojo.sh index fcbc81e7..967d139a 100755 --- a/utils/update-mojo.sh +++ b/utils/update-mojo.sh @@ -30,14 +30,18 @@ if [ -n "$(git -C "${chromium_dir}" status --porcelain)" ] ; then exit 1 fi +# Remove the previously imported files. +rm -rf "${ipc_dir}/mojo/" +rm -rf "${ipc_dir}/tools/" + # Copy the diagnosis file +mkdir -p "${ipc_dir}/tools/diagnosis" cp "${chromium_dir}/tools/diagnosis/crbug_1001171.py" "${ipc_dir}/tools/diagnosis" # Copy the rest of mojo +mkdir -p "${ipc_dir}/mojo/public" cp "${chromium_dir}/mojo/public/LICENSE" "${ipc_dir}/mojo/public" -rm -rf "${ipc_dir}/mojo/public/tools/*" - ( cd "${chromium_dir}" || exit find ./mojo/public/tools -type f \ -- cgit v1.2.1