From 35691fb0fbc95c9360e1320ae119d071d8f3267e Mon Sep 17 00:00:00 2001
From: Christopher Vagnetoft <labs@noccy.com>
Date: Fri, 9 Jan 2026 16:57:41 +0100
Subject: [PATCH] Misc cleanup, fix --force logic for build command

---
 src/Command/PackageBuildCommand.php | 9 +++++----
 src/Package/PackageBuilder.php      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Command/PackageBuildCommand.php b/src/Command/PackageBuildCommand.php
index 45213aa..9c79298 100644
--- a/src/Command/PackageBuildCommand.php
+++ b/src/Command/PackageBuildCommand.php
@@ -34,16 +34,17 @@ class PackageBuildCommand extends BaseCommand
     {
         $registry = $input->getOption("publish");
 
-        $builder = new PackageBuilder($output);
-
         $version = $input->getArgument("version");
+        $force = $input->getOption("force");
+
+        $builder = new PackageBuilder($output);
 
         $project = ProjectInfo::read(version:$version);
 
-        if ($registry && file_exists($project->filename) && !$input->getOption("force")) {
+        if (file_exists($project->filename) && !$force) {
             $output->writeln("<fg=black;bg=yellow>Package file already exists. Pass --force to rebuild it.</>");
         } else {
-            $builder->build($project, $input->getOption("dirty"), $input->getOption("force"));
+            $builder->build($project, $input->getOption("dirty"), $force);
         }
 
         if ($registry) {
diff --git a/src/Package/PackageBuilder.php b/src/Package/PackageBuilder.php
index 687f133..e34fb52 100644
--- a/src/Package/PackageBuilder.php
+++ b/src/Package/PackageBuilder.php
@@ -34,7 +34,7 @@ class PackageBuilder
         $filename = $currentDir . "/" . $project->filename;
 
         if (file_exists($filename) && !$overwrite) {
-            throw new \Exception("The package file already exists, pass --force to overwrite it.");
+            throw new \Exception("The package file already exists");
         }
 
         if (!$dirty) {