Rename file in single portable installs

microsoft · Aug 29, 2023 · 6e4ee36 · 6e4ee36
1 parent b1c432f
commit 6e4ee36
Showing 1 changed file with 9 additions and 20 deletions.
diff --git a/src/AppInstallerCLICore/Workflows/PortableFlow.cpp b/src/AppInstallerCLICore/Workflows/PortableFlow.cpp
@@ -196,7 +196,7 @@ namespace AppInstaller::CLI::Workflow
             for (const auto& nestedInstallerFile : nestedInstallerFiles)
             {
                 const std::filesystem::path& targetPath = targetInstallDirectory / ConvertToUTF16(nestedInstallerFile.RelativeFilePath);
-                
+
                 std::filesystem::path commandAlias;
                 if (nestedInstallerFile.PortableCommandAlias.empty())
                 {
@@ -215,31 +215,20 @@ namespace AppInstaller::CLI::Workflow
         {
             std::string_view renameArg = context.Args.GetArg(Execution::Args::Type::Rename);
             const std::vector<string_t>& commands = context.Get<Execution::Data::Installer>()->Commands;
-            std::filesystem::path fileName;
-            std::filesystem::path commandAlias;
-
-            if (!renameArg.empty())
+            std::filesystem::path commandAlias = installerPath.filename();
+
+            if (!commands.empty())
             {
-                fileName = commandAlias = ConvertToUTF16(renameArg);
+                commandAlias = ConvertToUTF16(commands[0]);
             }
-            else
-            {
-                if (!commands.empty())
-                {
-                    commandAlias = ConvertToUTF16(commands[0]);
-                }
-                else
-                {
-                    commandAlias = installerPath.filename();
-                }
 
-                fileName = installerPath.filename();
+            if (!renameArg.empty())
+            {
+                commandAlias = ConvertToUTF16(renameArg);
             }
-
-            AppInstaller::Filesystem::AppendExtension(fileName, ".exe");
             AppInstaller::Filesystem::AppendExtension(commandAlias, ".exe");
 
-            const std::filesystem::path& targetFullPath = targetInstallDirectory / fileName;
+            const std::filesystem::path& targetFullPath = targetInstallDirectory / commandAlias;
             entries.emplace_back(std::move(PortableFileEntry::CreateFileEntry(installerPath, targetFullPath, {})));
             entries.emplace_back(std::move(PortableFileEntry::CreateSymlinkEntry(symlinkDirectory / commandAlias, targetFullPath)));
         }