Skip to content

Allow to specify the distribution via -d #739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 13, 2022
Merged

Allow to specify the distribution via -d #739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0563dad
Allow to specify the distribution via -d
crramirez Mar 13, 2022
8f4f528
Increase the version
crramirez Mar 13, 2022
2e236a6
Code clean up
crramirez Mar 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 10 additions & 39 deletions DistroLauncher.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,95 +16,66 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|ARM = Debug|ARM
Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|ARM = Release|ARM
Release|ARM64 = Release|ARM64
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{BA627106-E5F7-46EE-B8D7-2D5A760F2FB2}.Debug|Any CPU.ActiveCfg = Debug|x64
{BA627106-E5F7-46EE-B8D7-2D5A760F2FB2}.Debug|ARM.ActiveCfg = Debug|x64
{BA627106-E5F7-46EE-B8D7-2D5A760F2FB2}.Debug|ARM64.ActiveCfg = Debug|ARM64
{BA627106-E5F7-46EE-B8D7-2D5A760F2FB2}.Debug|ARM64.Build.0 = Debug|ARM64
{BA627106-E5F7-46EE-B8D7-2D5A760F2FB2}.Debug|x64.ActiveCfg = Debug|x64
{BA627106-E5F7-46EE-B8D7-2D5A760F2FB2}.Debug|x64.Build.0 = Debug|x64
{BA627106-E5F7-46EE-B8D7-2D5A760F2FB2}.Debug|x86.ActiveCfg = Debug|x64
{BA627106-E5F7-46EE-B8D7-2D5A760F2FB2}.Release|Any CPU.ActiveCfg = Release|x64
{BA627106-E5F7-46EE-B8D7-2D5A760F2FB2}.Release|ARM.ActiveCfg = Release|x64
{BA627106-E5F7-46EE-B8D7-2D5A760F2FB2}.Release|ARM64.ActiveCfg = Release|ARM64
{BA627106-E5F7-46EE-B8D7-2D5A760F2FB2}.Release|ARM64.Build.0 = Release|ARM64
{BA627106-E5F7-46EE-B8D7-2D5A760F2FB2}.Release|x64.ActiveCfg = Release|x64
{BA627106-E5F7-46EE-B8D7-2D5A760F2FB2}.Release|x64.Build.0 = Release|x64
{BA627106-E5F7-46EE-B8D7-2D5A760F2FB2}.Release|x86.ActiveCfg = Release|x64
{4175DAA1-10E2-45BF-88BD-6577AF555B1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4175DAA1-10E2-45BF-88BD-6577AF555B1B}.Debug|ARM.ActiveCfg = Debug|ARM
{4175DAA1-10E2-45BF-88BD-6577AF555B1B}.Debug|ARM64.ActiveCfg = Debug|ARM64
{4175DAA1-10E2-45BF-88BD-6577AF555B1B}.Debug|ARM64.Build.0 = Debug|ARM64
{4175DAA1-10E2-45BF-88BD-6577AF555B1B}.Debug|ARM64.Deploy.0 = Debug|ARM64
{4175DAA1-10E2-45BF-88BD-6577AF555B1B}.Debug|x64.ActiveCfg = Debug|x64
{4175DAA1-10E2-45BF-88BD-6577AF555B1B}.Debug|x64.Build.0 = Debug|x64
{4175DAA1-10E2-45BF-88BD-6577AF555B1B}.Debug|x64.Deploy.0 = Debug|x64
{4175DAA1-10E2-45BF-88BD-6577AF555B1B}.Debug|x86.ActiveCfg = Debug|x86
{4175DAA1-10E2-45BF-88BD-6577AF555B1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4175DAA1-10E2-45BF-88BD-6577AF555B1B}.Release|ARM.ActiveCfg = Release|ARM
{4175DAA1-10E2-45BF-88BD-6577AF555B1B}.Release|ARM64.ActiveCfg = Release|ARM64
{4175DAA1-10E2-45BF-88BD-6577AF555B1B}.Release|ARM64.Build.0 = Release|ARM64
{4175DAA1-10E2-45BF-88BD-6577AF555B1B}.Release|ARM64.Deploy.0 = Release|ARM64
{4175DAA1-10E2-45BF-88BD-6577AF555B1B}.Release|x64.ActiveCfg = Release|x64
{4175DAA1-10E2-45BF-88BD-6577AF555B1B}.Release|x64.Build.0 = Release|x64
{4175DAA1-10E2-45BF-88BD-6577AF555B1B}.Release|x64.Deploy.0 = Release|x64
{4175DAA1-10E2-45BF-88BD-6577AF555B1B}.Release|x86.ActiveCfg = Release|x86
{3FBA1AEE-63DF-4490-82AE-74AAAB1BFD80}.Debug|Any CPU.ActiveCfg = Debug|Win32
{3FBA1AEE-63DF-4490-82AE-74AAAB1BFD80}.Debug|ARM.ActiveCfg = Debug|Win32
{3FBA1AEE-63DF-4490-82AE-74AAAB1BFD80}.Debug|ARM64.ActiveCfg = Debug|Win32
{3FBA1AEE-63DF-4490-82AE-74AAAB1BFD80}.Debug|Any CPU.ActiveCfg = Debug|x64
{3FBA1AEE-63DF-4490-82AE-74AAAB1BFD80}.Debug|ARM64.ActiveCfg = Debug|x64
{3FBA1AEE-63DF-4490-82AE-74AAAB1BFD80}.Debug|x64.ActiveCfg = Debug|x64
{3FBA1AEE-63DF-4490-82AE-74AAAB1BFD80}.Debug|x64.Build.0 = Debug|x64
{3FBA1AEE-63DF-4490-82AE-74AAAB1BFD80}.Debug|x86.ActiveCfg = Debug|Win32
{3FBA1AEE-63DF-4490-82AE-74AAAB1BFD80}.Release|Any CPU.ActiveCfg = Release|Win32
{3FBA1AEE-63DF-4490-82AE-74AAAB1BFD80}.Release|ARM.ActiveCfg = Release|Win32
{3FBA1AEE-63DF-4490-82AE-74AAAB1BFD80}.Release|ARM64.ActiveCfg = Release|Win32
{3FBA1AEE-63DF-4490-82AE-74AAAB1BFD80}.Release|Any CPU.ActiveCfg = Release|x64
{3FBA1AEE-63DF-4490-82AE-74AAAB1BFD80}.Release|ARM64.ActiveCfg = Release|x64
{3FBA1AEE-63DF-4490-82AE-74AAAB1BFD80}.Release|x64.ActiveCfg = Release|x64
{3FBA1AEE-63DF-4490-82AE-74AAAB1BFD80}.Release|x64.Build.0 = Release|x64
{3FBA1AEE-63DF-4490-82AE-74AAAB1BFD80}.Release|x86.ActiveCfg = Release|Win32
{4F3B346B-175D-46BC-B233-92D0B25D5576}.Debug|Any CPU.ActiveCfg = Debug|x86
{4F3B346B-175D-46BC-B233-92D0B25D5576}.Debug|ARM.ActiveCfg = Debug|ARM
{4F3B346B-175D-46BC-B233-92D0B25D5576}.Debug|Any CPU.ActiveCfg = Debug|x64
{4F3B346B-175D-46BC-B233-92D0B25D5576}.Debug|ARM64.ActiveCfg = Debug|ARM64
{4F3B346B-175D-46BC-B233-92D0B25D5576}.Debug|ARM64.Build.0 = Debug|ARM64
{4F3B346B-175D-46BC-B233-92D0B25D5576}.Debug|x64.ActiveCfg = Debug|x64
{4F3B346B-175D-46BC-B233-92D0B25D5576}.Debug|x64.Build.0 = Debug|x64
{4F3B346B-175D-46BC-B233-92D0B25D5576}.Debug|x86.ActiveCfg = Debug|x86
{4F3B346B-175D-46BC-B233-92D0B25D5576}.Release|Any CPU.ActiveCfg = Release|x86
{4F3B346B-175D-46BC-B233-92D0B25D5576}.Release|ARM.ActiveCfg = Release|ARM
{4F3B346B-175D-46BC-B233-92D0B25D5576}.Release|Any CPU.ActiveCfg = Release|x64
{4F3B346B-175D-46BC-B233-92D0B25D5576}.Release|ARM64.ActiveCfg = Release|ARM64
{4F3B346B-175D-46BC-B233-92D0B25D5576}.Release|ARM64.Build.0 = Release|ARM64
{4F3B346B-175D-46BC-B233-92D0B25D5576}.Release|x64.ActiveCfg = Release|x64
{4F3B346B-175D-46BC-B233-92D0B25D5576}.Release|x64.Build.0 = Release|x64
{4F3B346B-175D-46BC-B233-92D0B25D5576}.Release|x86.ActiveCfg = Release|x86
{D666189E-1DDB-4059-B362-213824968E68}.Debug|Any CPU.ActiveCfg = Debug|x64
{D666189E-1DDB-4059-B362-213824968E68}.Debug|Any CPU.Build.0 = Debug|x64
{D666189E-1DDB-4059-B362-213824968E68}.Debug|ARM.ActiveCfg = Debug|x64
{D666189E-1DDB-4059-B362-213824968E68}.Debug|ARM.Build.0 = Debug|x64
{D666189E-1DDB-4059-B362-213824968E68}.Debug|ARM64.ActiveCfg = Debug|x64
{D666189E-1DDB-4059-B362-213824968E68}.Debug|ARM64.Build.0 = Debug|x64
{D666189E-1DDB-4059-B362-213824968E68}.Debug|ARM64.ActiveCfg = Debug|ARM64
{D666189E-1DDB-4059-B362-213824968E68}.Debug|ARM64.Build.0 = Debug|ARM64
{D666189E-1DDB-4059-B362-213824968E68}.Debug|x64.ActiveCfg = Debug|x64
{D666189E-1DDB-4059-B362-213824968E68}.Debug|x64.Build.0 = Debug|x64
{D666189E-1DDB-4059-B362-213824968E68}.Debug|x86.ActiveCfg = Debug|Win32
{D666189E-1DDB-4059-B362-213824968E68}.Debug|x86.Build.0 = Debug|Win32
{D666189E-1DDB-4059-B362-213824968E68}.Release|Any CPU.ActiveCfg = Release|x64
{D666189E-1DDB-4059-B362-213824968E68}.Release|Any CPU.Build.0 = Release|x64
{D666189E-1DDB-4059-B362-213824968E68}.Release|ARM.ActiveCfg = Release|x64
{D666189E-1DDB-4059-B362-213824968E68}.Release|ARM.Build.0 = Release|x64
{D666189E-1DDB-4059-B362-213824968E68}.Release|ARM64.ActiveCfg = Release|x64
{D666189E-1DDB-4059-B362-213824968E68}.Release|ARM64.Build.0 = Release|x64
{D666189E-1DDB-4059-B362-213824968E68}.Release|ARM64.ActiveCfg = Release|ARM64
{D666189E-1DDB-4059-B362-213824968E68}.Release|ARM64.Build.0 = Release|ARM64
{D666189E-1DDB-4059-B362-213824968E68}.Release|x64.ActiveCfg = Release|x64
{D666189E-1DDB-4059-B362-213824968E68}.Release|x64.Build.0 = Release|x64
{D666189E-1DDB-4059-B362-213824968E68}.Release|x86.ActiveCfg = Release|Win32
{D666189E-1DDB-4059-B362-213824968E68}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
2 changes: 2 additions & 0 deletions DistroLauncher/DistributionInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ 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)
{
Expand Down
Loading