create & edit commands now only handle package names

1 files changed, 19 insertions, 30 deletions

diff --git a/toolsrc/src/commands_create.cpp b/toolsrc/src/commands_create.cpp
index 5e88f9c65..d1611eb5c 100644
--- a/toolsrc/src/commands_create.cpp
+++ b/toolsrc/src/commands_create.cpp
@@ -6,43 +6,32 @@
 
 namespace vcpkg
 {
-    void create_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet)
+    void create_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths)
     {
         static const std::string example = create_example_string(R"###(create zlib2 http://zlib.net/zlib128.zip "zlib128-2.zip")###");
         args.check_max_arg_count(3, example.c_str());
         args.check_min_arg_count(2, example.c_str());
 
-        expected<package_spec> current_spec = package_spec::from_string(args.command_arguments[0], default_target_triplet);
-        if (const package_spec* spec = current_spec.get())
-        {
-            Input::check_triplet(spec->target_triplet, paths);
-            Environment::ensure_utilities_on_path(paths);
-
-            // Space OR define the FILENAME with proper spacing
-            std::wstring custom_filename = L" ";
-            if (args.command_arguments.size() >= 3)
-            {
-                const std::string& zip_file_name = args.command_arguments.at(2);
-                Checks::check_exit(!Files::has_invalid_chars_for_filesystem(zip_file_name),
-                                   R"(Filename cannot contain invalid chars %s, but was %s)",
-                                   Files::FILESYSTEM_INVALID_CHARACTERS, zip_file_name);
-                custom_filename = Strings::wformat(LR"( -DFILENAME="%s" )", Strings::utf8_to_utf16(zip_file_name));
-            }
-
-            const std::wstring cmdline = Strings::wformat(LR"(cmake -DCMD=CREATE -DPORT=%s -DTARGET_TRIPLET=%s -DURL=%s%s-P "%s")",
-                                                          Strings::utf8_to_utf16(spec->name),
-                                                          Strings::utf8_to_utf16(spec->target_triplet.value),
-                                                          Strings::utf8_to_utf16(args.command_arguments.at(1)),
-                                                          custom_filename,
-                                                          paths.ports_cmake.generic_wstring());
+        const std::string port_name = args.command_arguments.at(0);
+        Environment::ensure_utilities_on_path(paths);
 
-            exit(System::cmd_execute(cmdline));
-        }
-        else
+        // Space OR define the FILENAME with proper spacing
+        std::wstring custom_filename = L" ";
+        if (args.command_arguments.size() >= 3)
         {
-            System::println(System::color::error, "Error: %s: %s", current_spec.error_code().message(), args.command_arguments[0]);
-            print_example(Strings::format("%s zlib:x64-windows", args.command).c_str());
-            exit(EXIT_FAILURE);
+            const std::string& zip_file_name = args.command_arguments.at(2);
+            Checks::check_exit(!Files::has_invalid_chars_for_filesystem(zip_file_name),
+                               R"(Filename cannot contain invalid chars %s, but was %s)",
+                               Files::FILESYSTEM_INVALID_CHARACTERS, zip_file_name);
+            custom_filename = Strings::wformat(LR"( -DFILENAME="%s" )", Strings::utf8_to_utf16(zip_file_name));
         }
+
+        const std::wstring cmdline = Strings::wformat(LR"(cmake -DCMD=CREATE -DPORT=%s -DURL=%s%s-P "%s")",
+                                                      Strings::utf8_to_utf16(port_name),
+                                                      Strings::utf8_to_utf16(args.command_arguments.at(1)),
+                                                      custom_filename,
+                                                      paths.ports_cmake.generic_wstring());
+
+        exit(System::cmd_execute(cmdline));
     }
 }