From 8183c20af45b77186e68246ea90e25254e946411 Mon Sep 17 00:00:00 2001 From: Utku Ozdemir Date: Mon, 9 Dec 2024 11:37:14 +0100 Subject: [PATCH] fix: ensure non-interactive move when fixing local output destinations Do a force move, so that `mv` command will not prompt to overwrite in any circumstance. Signed-off-by: Utku Ozdemir --- Makefile | 4 ++-- internal/project/common/docker.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 2f74a36..43381e3 100644 --- a/Makefile +++ b/Makefile @@ -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 @@ -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' diff --git a/internal/project/common/docker.go b/internal/project/common/docker.go index ca9cbbf..7bdb4b7 100644 --- a/internal/project/common/docker.go +++ b/internal/project/common/docker.go @@ -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'