fix(cli): Windows compatibility and MSVC cleanup

Author: GaspardKirira

src/cache/ArtifactCache.cpp

@@ -24,6 +24,7 @@
 
 #include <vix/cli/util/Fs.hpp>
 #include <vix/cli/util/Strings.hpp>
+#include <vix/utils/Env.hpp>
 
 namespace vix::cli::cache
 {
@@ -85,18 +86,18 @@ namespace vix::cli::cache
     static std::optional<std::string> user_home_dir()
     {
 #ifdef _WIN32
-      const char *home = std::getenv("USERPROFILE");
+      const char *home = vix::utils::vix_getenv("USERPROFILE");
       if (home && *home)
         return std::string(home);
 
-      const char *drive = std::getenv("HOMEDRIVE");
-      const char *path = std::getenv("HOMEPATH");
+      const char *drive = vix::utils::vix_getenv("HOMEDRIVE");
+      const char *path = vix::utils::vix_getenv("HOMEPATH");
       if (drive && *drive && path && *path)
         return std::string(drive) + std::string(path);
 
       return std::nullopt;
 #else
-      const char *home = std::getenv("HOME");
+      const char *home = vix::utils::vix_getenv("HOME");
       if (home && *home)
         return std::string(home);
 

src/cmake/GlobalPackages.cpp

@@ -11,6 +11,7 @@
  *  Vix.cpp
  */
 #include <vix/cli/cmake/GlobalPackages.hpp>
+#include <vix/utils/Env.hpp>
 
 #include <algorithm>
 #include <cstdlib>
@@ -29,9 +30,9 @@ namespace vix::cli::build
     static std::optional<std::string> home_dir()
     {
 #ifdef _WIN32
-      const char *home = std::getenv("USERPROFILE");
+      const char *home = vix::utils::vix_getenv("USERPROFILE");
 #else
-      const char *home = std::getenv("HOME");
+      const char *home = vix::utils::vix_getenv("HOME");
 #endif
       if (!home || std::string(home).empty())
         return std::nullopt;

src/commands/OutdatedCommand.cpp

@@ -13,6 +13,7 @@
  */
 #include <vix/cli/commands/OutdatedCommand.hpp>
 #include <vix/cli/util/Ui.hpp>
+#include <vix/utils/Env.hpp>
 #include <nlohmann/json.hpp>
 
 #include <algorithm>
@@ -71,9 +72,9 @@ namespace vix::commands
     fs::path home_dir()
     {
 #ifdef _WIN32
-      const char *home = std::getenv("USERPROFILE");
+      const char *home = vix::utils::vix_getenv("USERPROFILE");
 #else
-      const char *home = std::getenv("HOME");
+      const char *home = vix::utils::vix_getenv("HOME");
 #endif
       if (home == nullptr || std::string(home).empty())
       {

src/commands/PublishCommand.cpp

@@ -150,6 +150,48 @@ namespace vix::commands
       out << j.dump(2) << "\n";
     }
 
+    static std::string join_for_log(
+        const std::vector<std::string> &args)
+    {
+      std::ostringstream out;
+
+      for (std::size_t i = 0; i < args.size(); ++i)
+      {
+        if (i > 0)
+        {
+          out << ' ';
+        }
+
+        const std::string &arg = args[i];
+        const bool needsQuotes =
+            arg.find(' ') != std::string::npos ||
+            arg.find('\t') != std::string::npos ||
+            arg.find('"') != std::string::npos;
+
+        if (!needsQuotes)
+        {
+          out << arg;
+          continue;
+        }
+
+        out << '"';
+        for (char c : arg)
+        {
+          if (c == '"')
+          {
+            out << "\\\"";
+          }
+          else
+          {
+            out << c;
+          }
+        }
+        out << '"';
+      }
+
+      return out.str();
+    }
+
     struct ProcessResult
     {
       int exitCode{127};

src/commands/UpgradeCommand.cpp

@@ -1190,18 +1190,15 @@ namespace vix::commands
       fs::create_directories(extractDir, ec);
 
 #ifdef _WIN32
-      if (os == "windows")
-      {
-        const std::string ps =
-            "powershell -NoProfile -ExecutionPolicy Bypass -Command "
-            "\"Expand-Archive -LiteralPath '" +
-            archive.string() + "' -DestinationPath '" + extractDir.string() + "' -Force\"";
+      const std::string ps =
+          "powershell -NoProfile -ExecutionPolicy Bypass -Command "
+          "\"Expand-Archive -LiteralPath '" +
+          archive.string() + "' -DestinationPath '" + extractDir.string() + "' -Force\"";
 
-        if (exec_status(ps + " >nul 2>&1") != 0)
-          throw std::runtime_error("failed to extract archive");
+      if (exec_status(ps + " >nul 2>&1") != 0)
+        throw std::runtime_error("failed to extract archive");
 
-        return;
-      }
+      return;
 #endif
 
       if (!have_cmd("tar"))

src/commands/run/RunScript.cpp

@@ -76,9 +76,9 @@ namespace vix::commands::RunCommand::detail
     auto home_dir = []() -> std::optional<std::string>
     {
 #ifdef _WIN32
-      const char *home = std::getenv("USERPROFILE");
+      const char *home = vix::utils::vix_getenv("USERPROFILE");
 #else
-      const char *home = std::getenv("HOME");
+      const char *home = vix::utils::vix_getenv("HOME");
 #endif
       if (!home || std::string(home).empty())
         return std::nullopt;

src/commands/run/detail/ScriptCMake.cpp

@@ -12,6 +12,7 @@
  *
  */
 #include <vix/cli/commands/run/detail/ScriptCMake.hpp>
+#include <vix/utils/Env.hpp>
 
 #include <fstream>
 #include <string>
@@ -75,9 +76,9 @@ namespace vix::commands::RunCommand::detail
   static std::optional<std::string> home_dir()
   {
 #ifdef _WIN32
-    const char *home = std::getenv("USERPROFILE");
+    const char *home = vix::utils::vix_getenv("USERPROFILE");
 #else
-    const char *home = std::getenv("HOME");
+    const char *home = vix::utils::vix_getenv("HOME");
 #endif
     if (!home || std::string(home).empty())
       return std::nullopt;