Skip to content
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

Jump to bottom

Allow usage of portable files that are not .exe (such as .jar). #3385

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −4
Open

Allow usage of portable files that are not .exe (such as .jar). #3385

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/AppInstallerCLICore/Workflows/DownloadFlow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ namespace AppInstaller::CLI::Workflow
}

// Get the file extension to be used for the installer file.
std::wstring_view GetInstallerFileExtension(Execution::Context& context)
std::wstring_view GetInstallerFileExtension(std::wstring extension, Execution::Context& context)
{
const auto& installer = context.Get<Execution::Data::Installer>();
switch (installer->BaseInstallerType)
Expand All @@ -41,8 +41,10 @@ namespace AppInstaller::CLI::Workflow
case InstallerTypeEnum::Exe:
case InstallerTypeEnum::Inno:
case InstallerTypeEnum::Nullsoft:
case InstallerTypeEnum::Portable:
return L".exe"sv;
case InstallerTypeEnum::Portable:
// When a portable installer has an extension, use it, it might be a .jar, or portable executable file.
return not extension.empty() ? extension : L".exe"sv;
case InstallerTypeEnum::Msi:
case InstallerTypeEnum::Wix:
return L".msi"sv;
Expand All @@ -67,7 +69,8 @@ namespace AppInstaller::CLI::Workflow
{
// Get file name from download URI
std::filesystem::path filename = GetFileNameFromURI(context.Get<Execution::Data::Installer>()->Url);
std::wstring_view installerExtension = GetInstallerFileExtension(context);
std::wstring currentExtension = filename.has_extension() ? std::wstring(filename.extension()) : std::wstring(L"");
std::wstring_view installerExtension = GetInstallerFileExtension(currentExtension, context);

// Assuming that we find a safe stem value in the URI, use it.
// This should be extremely common, but just in case fall back to the older name style.
Expand Down Expand Up @@ -451,7 +454,6 @@ namespace AppInstaller::CLI::Workflow
}

Filesystem::RenameFile(installerPath, renamedDownloadedInstaller);

installerPath.assign(renamedDownloadedInstaller);
AICLI_LOG(CLI, Info, << "Successfully renamed downloaded installer. Path: " << installerPath);
}
Expand Down