Merge pull request #740 from WhitewaterFoundry/development

Code clean up
WhitewaterFoundry · Mar 13, 2022 · 688de78 · 688de78
2 parents 1448076 + 9ed08da
commit 688de78
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/DistroLauncher/DistributionInfo.cpp b/DistroLauncher/DistributionInfo.cpp
@@ -13,8 +13,6 @@ HRESULT DistributionInfo::ChangeDefaultUserInWslConf(const std::wstring_view use
     _swprintf_p(commandLine, _countof(commandLine),
                 L"if [ $(grep -c \"\\[user\\]\" /etc/wsl.conf) -eq \"0\" ]; then echo -e \"\\n[user]\\ndefault=%1$s\">>/etc/wsl.conf; else sed -i \"s/\\(default=\\)\\(.*\\)/\\1%1$s/\" /etc/wsl.conf ; fi",
                 std::wstring(userName).c_str());
-    MessageBoxW(nullptr, commandLine, L"Hola", MB_OK);
-
 
     if (const auto hr = g_wslApi.WslLaunchInteractive(commandLine, true, &exitCode); FAILED(hr) || exitCode != 0)
     {

diff --git a/DistroLauncher/DistroLauncher.cpp b/DistroLauncher/DistroLauncher.cpp
@@ -200,6 +200,14 @@ int wmain(const int argc, const wchar_t* argv[])
     // Install the distribution if it is not already.
     const auto installOnly = arguments.size() > 0 && arguments[0] == ARG_INSTALL;
     auto hr = S_OK;
+/*
+
+    if (!g_wslApi.WslIsDistributionRegistered())
+    {
+        g_wslApi.SetDistributionName(L"Pengwin");
+    }
+*/
+
     if (!g_wslApi.WslIsDistributionRegistered())
     {
         // If the "--root" option is specified, do not create a user account.

diff --git a/Pengwin/Package.appxmanifest b/Pengwin/Package.appxmanifest
@@ -11,7 +11,7 @@
   <Identity
     Name="WhitewaterFoundryLtd.Co.16571368D6CFF"
     Publisher="CN=9879127B-9E92-4DE5-9C32-0B1F09F95DCF"
-    Version="22.3.1.0" />
+    Version="22.3.2.0" />
 
   <Properties>
     <DisplayName>Pengwin</DisplayName>