commit a5eec1646e96f68109b978ec3fe1a9eec31252d2 parent 409ce766b067e0916f7a54c73d932020b1aedc7f Author: jamespik <48262337+jamespik@users.noreply.github.com> Date: Wed, 22 Apr 2020 10:29:20 -0700 Fix Typos (#91) Diffstat:
8 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/src/AppInstallerCLICore/ExecutionArgs.h b/src/AppInstallerCLICore/ExecutionArgs.h @@ -89,6 +89,7 @@ namespace AppInstaller::CLI::Execution { return m_parsedArgs[arg].empty(); } + void AddArg(Type arg, std::string value) { m_parsedArgs[arg].emplace_back(std::move(value)); diff --git a/src/AppInstallerCLICore/ExecutionProgress.cpp b/src/AppInstallerCLICore/ExecutionProgress.cpp @@ -189,9 +189,10 @@ namespace AppInstaller::CLI::Execution // Indent two spaces for the spinner, but three here so that we can overwrite it in the loop. m_out << " "; - for (size_t i = 0; !m_canceled; ++i) { - constexpr size_t repititionCount = 20; - ApplyStyle(i % repititionCount, repititionCount, true); + for (size_t i = 0; !m_canceled; ++i) + { + constexpr size_t repetitionCount = 20; + ApplyStyle(i % repetitionCount, repetitionCount, true); m_out << '\b' << spinnerChars[i % ARRAYSIZE(spinnerChars)] << std::flush; Sleep(250); } diff --git a/src/AppInstallerCLICore/Workflows/ManifestComparator.cpp b/src/AppInstallerCLICore/Workflows/ManifestComparator.cpp @@ -10,7 +10,7 @@ namespace AppInstaller::CLI::Workflow { bool InstallerComparator::operator() (const ManifestInstaller& installer1, const ManifestInstaller& installer2) { - // Todo: Comapre only architecture for now. Need more work and spec. + // Todo: Compare only architecture for now. Need more work and spec. if (Utility::IsApplicableArchitecture(installer1.Arch) < Utility::IsApplicableArchitecture(installer2.Arch)) { return false; @@ -40,7 +40,7 @@ namespace AppInstaller::CLI::Workflow { AICLI_LOG(CLI, Info, << "Starting installer selection."); - // Sorting the list of availlable installers according to rules defined in InstallerComparator. + // Sorting the list of available installers according to rules defined in InstallerComparator. auto installers = manifest.Installers; std::sort(installers.begin(), installers.end(), InstallerComparator()); @@ -63,7 +63,7 @@ namespace AppInstaller::CLI::Workflow ManifestLocalization selectedLocalization; - // Sorting the list of availlable localizations according to rules defined in LocalizationComparator. + // Sorting the list of available localizations according to rules defined in LocalizationComparator. if (!manifest.Localization.empty()) { auto localization = manifest.Localization; @@ -75,7 +75,7 @@ namespace AppInstaller::CLI::Workflow } else { - // Pupulate default from package manifest + // Populate default from package manifest selectedLocalization.Description = manifest.Description; selectedLocalization.Homepage = manifest.Homepage; selectedLocalization.LicenseUrl = manifest.LicenseUrl; diff --git a/src/AppInstallerCLICore/Workflows/ShellExecuteInstallerHandler.cpp b/src/AppInstallerCLICore/Workflows/ShellExecuteInstallerHandler.cpp @@ -14,7 +14,7 @@ namespace AppInstaller::CLI::Workflow // ShellExecutes the given path. std::optional<DWORD> InvokeShellExecute(const std::filesystem::path& filePath, const std::string& args, IProgressCallback& progress) { - AICLI_LOG(CLI, Info, << "Staring installer. Path: " << filePath); + AICLI_LOG(CLI, Info, << "Starting installer. Path: " << filePath); SHELLEXECUTEINFOA execInfo = { 0 }; execInfo.cbSize = sizeof(SHELLEXECUTEINFO); @@ -22,7 +22,7 @@ namespace AppInstaller::CLI::Workflow std::string filePathUTF8Str = filePath.u8string(); execInfo.lpFile = filePathUTF8Str.c_str(); execInfo.lpParameters = args.c_str(); - // Some installer forces UI. Setting to SW_HIDE will hide installer UI and installation will hang forever. + // Some installers force UI. Setting to SW_HIDE will hide installer UI and installation will hang forever. // Verified setting to SW_SHOW does not hurt silent mode since no UI will be shown. execInfo.nShow = SW_SHOW; if (!ShellExecuteExA(&execInfo) || !execInfo.hProcess) @@ -58,7 +58,7 @@ namespace AppInstaller::CLI::Workflow } } - // Gets the escaped isntaller args. + // Gets the escaped installer args. std::string GetInstallerArgsTemplate(Execution::Context& context) { std::string installerArgs = ""; diff --git a/src/AppInstallerCommonCore/DateTime.cpp b/src/AppInstallerCommonCore/DateTime.cpp @@ -43,7 +43,7 @@ namespace AppInstaller::Utility { static_assert(std::is_same_v<int64_t, decltype(time(nullptr))>, "time returns a 64-bit integer"); time_t now = time(nullptr); - return static_cast<int64_t>(now); + return static_cast<int64_t>(now); } int64_t ConvertSystemClockToUnixEpoch(const std::chrono::system_clock::time_point& time) diff --git a/src/AppInstallerCommonCore/HttpStream/HttpClientWrapper.cpp b/src/AppInstallerCommonCore/HttpStream/HttpClientWrapper.cpp @@ -14,7 +14,7 @@ using namespace winrt::Windows::Web::Http::Headers; using namespace winrt::Windows::Web::Http::Filters; // Note: this class is used by the HttpRandomAccessStream which is passed to the AppxPackaging COM API -// All exceptions thrown accross dll boundaries should be WinRT exception not custom exceptions. +// All exceptions thrown across dll boundaries should be WinRT exception not custom exceptions. // The HRESULTs will be mapped to UI error code by the appropriate component namespace AppInstaller::Utility::HttpStream { diff --git a/src/AppInstallerCommonCore/HttpStream/HttpLocalCache.cpp b/src/AppInstallerCommonCore/HttpStream/HttpLocalCache.cpp @@ -154,7 +154,7 @@ namespace AppInstaller::Utility::HttpStream // To make things easy, we will download the contiguous range that includes all the unsatisfiable ranges. // Note that in theory, this may include cached pages. However, this situation is rarely expected to happen, // if at all. The package reader usually reads things in chunks of 64 KB or less, so, we should expect to - // always have up to two statisfiable and unsatisfiable pages in total. + // always have up to two satisfiable and unsatisfiable pages in total. UINT64 fileSize = httpClientWrapper->GetFullFileSize(); ULONG64 downloadJobStartPosition = 0U; ULONG64 downloadJobEndPosition = 0U; diff --git a/src/AppInstallerCommonCore/HttpStream/HttpRandomAccessStream.cpp b/src/AppInstallerCommonCore/HttpStream/HttpRandomAccessStream.cpp @@ -8,7 +8,7 @@ using namespace winrt::Windows::Foundation; using namespace winrt::Windows::Storage::Streams; // Note: the HttpRandomAccessStream is passed to the AppxPackaging COM API -// All exceptions thrown accross dll boundaries should be WinRT exception not custom exceptions. +// All exceptions thrown across dll boundaries should be WinRT exception not custom exceptions. // The HRESULTs will be mapped to UI error code by the appropriate component namespace AppInstaller::Utility::HttpStream {