Skip to content

Commit

Permalink
fix: ensure non-interactive move when fixing local output destinations
Browse files Browse the repository at this point in the history
Do a force move, so that `mv` command will not prompt to overwrite in any circumstance.

Signed-off-by: Utku Ozdemir <utku.ozdemir@siderolabs.com>
  • Loading branch information
utkuozdemir committed Dec 9, 2024
1 parent 1ebe796 commit 8183c20
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2024-12-06T11:22:01Z by kres c401487d.
# Generated on 2024-12-09T10:37:39Z by kres 2e7a4967.

# common variables

Expand Down Expand Up @@ -152,7 +152,7 @@ local-%: ## Builds the specified target defined in the Dockerfile using the loc
echo $$platform; \
directory="$${platform//\//_}"; \
if [[ -d "$$DEST/$$directory" ]]; then \
mv "$$DEST/$$directory/"* $$DEST; \
mv -f "$$DEST/$$directory/"* $$DEST; \
rmdir "$$DEST/$$directory/"; \
fi; \
done'
Expand Down
2 changes: 1 addition & 1 deletion internal/project/common/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const FixLocalDestLocationsScript = `
echo $$platform; \
directory="$${platform//\//_}"; \
if [[ -d "$$DEST/$$directory" ]]; then \
mv "$$DEST/$$directory/"* $$DEST; \
mv -f "$$DEST/$$directory/"* $$DEST; \
rmdir "$$DEST/$$directory/"; \
fi; \
done'
Expand Down

0 comments on commit 8183c20

Please sign in to comment.