summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2024-01-04 17:15:41 +0200
committerKieran Bingham <kieran.bingham@ideasonboard.com>2024-01-09 15:39:04 +0000
commitcb69c6e84356b2e137d5b27885223a8514c7e802 (patch)
treefd2dc57a3b8cf4ed3917db51f48537447d63fb19 /utils
parenteffb8f5d7c468ef3e2c293c5cd5e66407108ed7a (diff)
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 <laurent.pinchart@ideasonboard.com> Reviewed-by: Milan Zamazal <mzamazal@redhat.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Diffstat (limited to 'utils')
-rwxr-xr-xutils/update-mojo.sh8
1 files 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 \