From 6dc5489bbe5e0e511966cbe67471e49e0e41ae6a Mon Sep 17 00:00:00 2001
From: Ed Singleton <singletoned@gmail.com>
Date: Tue, 8 Jul 2025 02:27:26 +0100
Subject: [PATCH] Handle spaces in current dir by quoting paths (#199)

Added "" around some paths so that spaces in directory names will work
---
 Makefile         | 14 +++++++-------
 vminitd/Makefile |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 6267ce83..9f67f283 100644
--- a/Makefile
+++ b/Makefile
@@ -46,8 +46,8 @@ containerization:
 	@$(SWIFT) build -c $(BUILD_CONFIGURATION)
 
 	@echo Copying containerization binaries...
-	@install $(BUILD_BIN_DIR)/cctl ./bin/
-	@install $(BUILD_BIN_DIR)/containerization-integration ./bin/
+	@install "$(BUILD_BIN_DIR)/cctl" ./bin/
+	@install "$(BUILD_BIN_DIR)/containerization-integration" ./bin/
 
 	@echo Signing containerization binaries...
 	@codesign --force --sign - --timestamp=none --entitlements=signing/vz.entitlements bin/cctl
@@ -71,11 +71,11 @@ vminitd:
 .PHONY: update-libarchive-source
 update-libarchive-source:
 	@echo Updating the libarchive source files...
-	@git clone $(LIBARCHIVE_UPSTREAM_REPO) --depth 1 --branch $(LIBARCHIVE_UPSTREAM_VERSION) $(LIBARCHIVE_LOCAL_DIR)
-	@cp $(LIBARCHIVE_LOCAL_DIR)/libarchive/archive_entry.h Sources/ContainerizationArchive/CArchive/include
-	@cp $(LIBARCHIVE_LOCAL_DIR)/libarchive/archive.h Sources/ContainerizationArchive/CArchive/include
-	@cp $(LIBARCHIVE_LOCAL_DIR)/COPYING Sources/ContainerizationArchive/CArchive/COPYING
-	@rm -rf $(LIBARCHIVE_LOCAL_DIR)
+	@git clone $(LIBARCHIVE_UPSTREAM_REPO) --depth 1 --branch $(LIBARCHIVE_UPSTREAM_VERSION) "$(LIBARCHIVE_LOCAL_DIR)"
+	@cp "$(LIBARCHIVE_LOCAL_DIR)/libarchive/archive_entry.h" Sources/ContainerizationArchive/CArchive/include
+	@cp "$(LIBARCHIVE_LOCAL_DIR)/libarchive/archive.h" Sources/ContainerizationArchive/CArchive/include
+	@cp "$(LIBARCHIVE_LOCAL_DIR)/COPYING" Sources/ContainerizationArchive/CArchive/COPYING
+	@rm -rf "$(LIBARCHIVE_LOCAL_DIR)"
 
 .PHONY: test
 test:
diff --git a/vminitd/Makefile b/vminitd/Makefile
index dabaff8e..68950682 100644
--- a/vminitd/Makefile
+++ b/vminitd/Makefile
@@ -37,8 +37,8 @@ all:
 	@rm -f ./bin/vminitd
 	@rm -f ./bin/vmexec
 	@swift build -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION)
-	@install $(VMINITD_BIN_PATH)/vminitd ./bin/vminitd
-	@install $(VMINITD_BIN_PATH)/vmexec ./bin/vmexec
+	@install "$(VMINITD_BIN_PATH)/vminitd" ./bin/
+	@install "$(VMINITD_BIN_PATH)/vmexec" ./bin/
 
 .PHONY: cross-prep
 cross-prep: linux-sdk macos-sdk