From 3cc85897d1f2259d2ca0f1a1cb94b80c46f6b7cb Mon Sep 17 00:00:00 2001 From: Ivan Pozdeev Date: Wed, 23 Oct 2019 07:30:28 +0300 Subject: [PATCH] (GH-89) Rename shims to an apt-style prefix 'cpack' proved to conflict with CMake. With a longer prefix, conflicts are practically impossible. --- docs/generated/CommandsInstall.md | 4 +-- docs/generated/CommandsList.md | 4 +-- docs/generated/CommandsPush.md | 4 +-- docs/generated/CommandsReference.md | 4 +-- docs/generated/CommandsSearch.md | 4 +-- docs/generated/CommandsUninstall.md | 4 +-- docs/generated/CommandsUpgrade.md | 4 +-- nuget/chocolatey/tools/chocolateysetup.psm1 | 2 +- setup.ps1 | 2 +- .../chocolatey.resources.csproj | 28 +++++++++--------- .../redirects/{cinst.exe => choco-inst.exe} | Bin 136192 -> 136202 bytes ...cinst.exe.ignore => choco-inst.exe.ignore} | 0 .../redirects/{clist.exe => choco-list.exe} | Bin 136192 -> 136202 bytes ...clist.exe.ignore => choco-list.exe.ignore} | 0 .../redirects/{cpack.exe => choco-pack.exe} | Bin 136192 -> 136202 bytes ...cpack.exe.ignore => choco-pack.exe.ignore} | 0 .../redirects/{cpush.exe => choco-push.exe} | Bin 136192 -> 136202 bytes ...cpush.exe.ignore => choco-push.exe.ignore} | 0 .../{cuninst.exe => choco-uninst.exe} | Bin 136192 -> 136202 bytes ...nst.exe.ignore => choco-uninst.exe.ignore} | 0 .../redirects/{cup.exe => choco-up.exe} | Bin 136192 -> 136202 bytes .../{cup.exe.ignore => choco-up.exe.ignore} | 0 .../redirects/{cver.exe => choco-ver.exe} | Bin 136192 -> 136202 bytes .../{cver.exe.ignore => choco-ver.exe.ignore} | 0 .../commands/ChocolateyListCommand.cs | 4 +-- .../commands/ChocolateyPackCommand.cs | 6 ++-- .../commands/ChocolateyPushCommand.cs | 4 +-- .../commands/ChocolateyUninstallCommand.cs | 4 +-- .../commands/ChocolateyUpgradeCommand.cs | 4 +-- .../commands/ChocolateyVersionCommand.cs | 2 +- 30 files changed, 42 insertions(+), 42 deletions(-) rename src/chocolatey.resources/redirects/{cinst.exe => choco-inst.exe} (95%) rename src/chocolatey.resources/redirects/{cinst.exe.ignore => choco-inst.exe.ignore} (100%) rename src/chocolatey.resources/redirects/{clist.exe => choco-list.exe} (95%) rename src/chocolatey.resources/redirects/{clist.exe.ignore => choco-list.exe.ignore} (100%) rename src/chocolatey.resources/redirects/{cpack.exe => choco-pack.exe} (95%) rename src/chocolatey.resources/redirects/{cpack.exe.ignore => choco-pack.exe.ignore} (100%) rename src/chocolatey.resources/redirects/{cpush.exe => choco-push.exe} (95%) rename src/chocolatey.resources/redirects/{cpush.exe.ignore => choco-push.exe.ignore} (100%) rename src/chocolatey.resources/redirects/{cuninst.exe => choco-uninst.exe} (95%) rename src/chocolatey.resources/redirects/{cuninst.exe.ignore => choco-uninst.exe.ignore} (100%) rename src/chocolatey.resources/redirects/{cup.exe => choco-up.exe} (95%) rename src/chocolatey.resources/redirects/{cup.exe.ignore => choco-up.exe.ignore} (100%) rename src/chocolatey.resources/redirects/{cver.exe => choco-ver.exe} (95%) rename src/chocolatey.resources/redirects/{cver.exe.ignore => choco-ver.exe.ignore} (100%) diff --git a/docs/generated/CommandsInstall.md b/docs/generated/CommandsInstall.md index d6d21bf618..5373513e37 100644 --- a/docs/generated/CommandsInstall.md +++ b/docs/generated/CommandsInstall.md @@ -3,7 +3,7 @@ # Install Command (choco install) Installs a package or a list of packages (sometimes specified as a - packages.config). Some may prefer to use `cinst` as a shortcut for + packages.config). Some may prefer to use `choco-inst` as a shortcut for [[`choco install`|Commandsinstall]]. **NOTE:** 100% compatible with older chocolatey client (0.9.8.32 and below) @@ -14,7 +14,7 @@ Installs a package or a list of packages (sometimes specified as a ## Usage choco install [ ] [] - cinst [ ] [] + choco-inst [ ] [] **NOTE:** `all` is a special package keyword that will allow you to install all packages from a custom feed. Will not work with Chocolatey default diff --git a/docs/generated/CommandsList.md b/docs/generated/CommandsList.md index 6a1a84cdc2..b765b0fa1c 100644 --- a/docs/generated/CommandsList.md +++ b/docs/generated/CommandsList.md @@ -3,7 +3,7 @@ # List/Search Command (choco list) Chocolatey will perform a search for a package local or remote. Some - may prefer to use [[`clist`|Commandslist]] as a shortcut for [[`choco list`|Commandslist]]. + may prefer to use [[`choco-list`|Commandslist]] as a shortcut for [[`choco list`|Commandslist]]. **NOTE:** 100% compatible with older Chocolatey client (0.9.8.x and below) with options and switches. In most cases you can still pass options @@ -14,7 +14,7 @@ Chocolatey will perform a search for a package local or remote. Some choco search [] choco list [] - clist [] + choco-list [] ## Examples diff --git a/docs/generated/CommandsPush.md b/docs/generated/CommandsPush.md index eec789429d..24167385c2 100644 --- a/docs/generated/CommandsPush.md +++ b/docs/generated/CommandsPush.md @@ -3,7 +3,7 @@ # Push Command (choco push) Chocolatey will attempt to push a compiled nupkg to a package feed. - Some may prefer to use `cpush` as a shortcut for `choco push`. + Some may prefer to use `choco-push` as a shortcut for `choco push`. **NOTE:** 100% compatible with older chocolatey client (0.9.8.32 and below) with options and switches. Default push location is deprecated and @@ -19,7 +19,7 @@ A feed can be a local folder, a file share, the [community feed](https://chocola ## Usage choco push [] [] - cpush [] [] + choco-push [] [] **NOTE:** If there is more than one nupkg file in the folder, the command will require specifying the path to the file. diff --git a/docs/generated/CommandsReference.md b/docs/generated/CommandsReference.md index 5299d5b128..f52238c7cf 100644 --- a/docs/generated/CommandsReference.md +++ b/docs/generated/CommandsReference.md @@ -25,7 +25,7 @@ This is a listing of all of the different things you can pass to choco. * [[setapikey|CommandsSetapikey]] - retrieves or saves an apikey for a particular source (alias for apikey) * [[apikey|CommandsApikey]] - retrieves or saves an apikey for a particular source * [[unpackself|CommandsUnpackself]] - have chocolatey set itself up - * [[version|CommandsVersion]] - [DEPRECATED] will be removed in v1 - use [[`choco outdated`|Commandsoutdated]] or `cup -whatif` instead + * [[version|CommandsVersion]] - [DEPRECATED] will be removed in v1 - use [[`choco outdated`|Commandsoutdated]] or `choco-up -whatif` instead * [[update|CommandsUpdate]] - [DEPRECATED] RESERVED for future use (you are looking for upgrade, these are not the droids you are looking for) * [[support|CommandsSupport]] - provides support information * [[download|CommandsDownload]] - downloads packages - optionally internalizing all remote resources @@ -89,7 +89,7 @@ Following this guide will ensure your experience is not frustrating based on choco not receiving things you think you are passing to it. * For consistency, always use `choco`, not `choco.exe`. Never use - shortcut commands like `cinst` or `cup`. + shortcut commands like `choco-inst` or `choco-up`. * Always have the command as the first argument to `choco. e.g. [[`choco install`|Commandsinstall]], where [[`install`|Commandsinstall]] is the command. * If there is a subcommand, ensure that is the second argument. e.g. diff --git a/docs/generated/CommandsSearch.md b/docs/generated/CommandsSearch.md index 2b3f1120a8..2255b077a1 100644 --- a/docs/generated/CommandsSearch.md +++ b/docs/generated/CommandsSearch.md @@ -3,7 +3,7 @@ # List/Search Command (choco search) Chocolatey will perform a search for a package local or remote. Some - may prefer to use [[`clist`|Commandslist]] as a shortcut for [[`choco list`|Commandslist]]. + may prefer to use [[`choco-list`|Commandslist]] as a shortcut for [[`choco list`|Commandslist]]. **NOTE:** 100% compatible with older Chocolatey client (0.9.8.x and below) with options and switches. In most cases you can still pass options @@ -14,7 +14,7 @@ Chocolatey will perform a search for a package local or remote. Some choco search [] choco list [] - clist [] + choco-list [] ## Examples diff --git a/docs/generated/CommandsUninstall.md b/docs/generated/CommandsUninstall.md index 60b1764208..07bf3d52c7 100644 --- a/docs/generated/CommandsUninstall.md +++ b/docs/generated/CommandsUninstall.md @@ -3,7 +3,7 @@ # Uninstall Command (choco uninstall) Uninstalls a package or a list of packages. Some may prefer to use - `cuninst` as a shortcut for [[`choco uninstall`|Commandsuninstall]]. + `choco-uninst` as a shortcut for [[`choco uninstall`|Commandsuninstall]]. **NOTE:** 100% compatible with older chocolatey client (0.9.8.32 and below) with options and switches. Add `-y` for previous behavior with no @@ -54,7 +54,7 @@ chocolatey without attempting to uninstall the program. ## Usage choco uninstall [pkg2 pkgN] [options/switches] - cuninst [pkg2 pkgN] [options/switches] + choco-uninst [pkg2 pkgN] [options/switches] **NOTE:** `all` is a special package keyword that will allow you to uninstall all packages. diff --git a/docs/generated/CommandsUpgrade.md b/docs/generated/CommandsUpgrade.md index ef5fd2e66c..15330db468 100644 --- a/docs/generated/CommandsUpgrade.md +++ b/docs/generated/CommandsUpgrade.md @@ -2,7 +2,7 @@ # Upgrade Command (choco upgrade) -Upgrades a package or a list of packages. Some may prefer to use `cup` +Upgrades a package or a list of packages. Some may prefer to use `choco-up` as a shortcut for [[`choco upgrade`|Commandsupgrade]]. If you do not have a package installed, upgrade will install it. @@ -14,7 +14,7 @@ Upgrades a package or a list of packages. Some may prefer to use `cup` ## Usage choco upgrade [ ] [] - cup [ ] [] + choco-up [ ] [] **NOTE:** `all` is a special package keyword that will allow you to upgrade all currently installed packages. diff --git a/nuget/chocolatey/tools/chocolateysetup.psm1 b/nuget/chocolatey/tools/chocolateysetup.psm1 index 6dd5334074..1f5d4962d8 100644 --- a/nuget/chocolatey/tools/chocolateysetup.psm1 +++ b/nuget/chocolatey/tools/chocolateysetup.psm1 @@ -314,7 +314,7 @@ param( $from = "$chocolateyPathOld\bin" $to = "$chocolateyPath\bin" - $exclude = @("choco.exe", "chocolatey.exe", "cinst.exe", "clist.exe", "cpack.exe", "cpush.exe", "cuninst.exe", "cup.exe", "cver.exe", "RefreshEnv.cmd") + $exclude = @("choco.exe", "chocolatey.exe", "choco-inst.exe", "choco-list.exe", "choco-pack.exe", "choco-push.exe", "choco-uninst.exe", "choco-up.exe", "choco-ver.exe", "RefreshEnv.cmd") Get-ChildItem -Path $from -recurse -Exclude $exclude | % { Write-Debug "Copying $_ `n to $to" diff --git a/setup.ps1 b/setup.ps1 index 17b80ad72e..decbdfbb91 100644 --- a/setup.ps1 +++ b/setup.ps1 @@ -3,4 +3,4 @@ if(-not $env:ChocolateyInstall -or -not (Test-Path "$env:ChocolateyInstall")){ iex ((new-object net.webclient).DownloadString("https://chocolatey.org/install.ps1")) } -cinst pester -version 2.0.2 +choco-inst pester -version 2.0.2 diff --git a/src/chocolatey.resources/chocolatey.resources.csproj b/src/chocolatey.resources/chocolatey.resources.csproj index 7ab50de40a..6ab39d9721 100644 --- a/src/chocolatey.resources/chocolatey.resources.csproj +++ b/src/chocolatey.resources/chocolatey.resources.csproj @@ -82,13 +82,13 @@ - - - - - - - + + + + + + + @@ -96,13 +96,13 @@ - - - - - - - + + + + + + + diff --git a/src/chocolatey.resources/redirects/cinst.exe b/src/chocolatey.resources/redirects/choco-inst.exe similarity index 95% rename from src/chocolatey.resources/redirects/cinst.exe rename to src/chocolatey.resources/redirects/choco-inst.exe index 451e22b227f73177ed2bc0a41fc3ad0c784a3b5b..19fd2079ecb1353cf75899c637d7506efbdc5ee0 100644 GIT binary patch delta 35 ncmZoz!O^vXW5aS8){Ok*eBI5{%w}Pw?ZQfoZ$AP6?3)b! delta 23 fcmeBL!O^gSW5aTp&1+)w#zCpzWoRQajyws diff --git a/src/chocolatey.resources/redirects/cinst.exe.ignore b/src/chocolatey.resources/redirects/choco-inst.exe.ignore similarity index 100% rename from src/chocolatey.resources/redirects/cinst.exe.ignore rename to src/chocolatey.resources/redirects/choco-inst.exe.ignore diff --git a/src/chocolatey.resources/redirects/clist.exe b/src/chocolatey.resources/redirects/choco-list.exe similarity index 95% rename from src/chocolatey.resources/redirects/clist.exe rename to src/chocolatey.resources/redirects/choco-list.exe index d6ca4917c902d5ab0cf10a641dad7cee614074f7..05b5a0aad617645a0b4a2de26a995f81ec6c3e44 100644 GIT binary patch delta 35 ncmZoz!O^vXW5aS8){Ok*eBI5{%w}Pw?ZQfoZ$AP6?3)b! delta 23 fcmeBL!O^gSW5aTp&1+)w#zCpzWoRQajyws diff --git a/src/chocolatey.resources/redirects/clist.exe.ignore b/src/chocolatey.resources/redirects/choco-list.exe.ignore similarity index 100% rename from src/chocolatey.resources/redirects/clist.exe.ignore rename to src/chocolatey.resources/redirects/choco-list.exe.ignore diff --git a/src/chocolatey.resources/redirects/cpack.exe b/src/chocolatey.resources/redirects/choco-pack.exe similarity index 95% rename from src/chocolatey.resources/redirects/cpack.exe rename to src/chocolatey.resources/redirects/choco-pack.exe index 1ddea401f82d62bc1f81f834f09749b492368b95..c806416423abc5ed15fd7adb59c14933a8aa80a6 100644 GIT binary patch delta 35 ncmZoz!O^vXW5aS8){Ok*eBI5{%w}Pw?ZQfoZ$AP6?3)b! delta 23 fcmeBL!O^gSW5aTp&1+)w#zCpzWoRQajyws diff --git a/src/chocolatey.resources/redirects/cpack.exe.ignore b/src/chocolatey.resources/redirects/choco-pack.exe.ignore similarity index 100% rename from src/chocolatey.resources/redirects/cpack.exe.ignore rename to src/chocolatey.resources/redirects/choco-pack.exe.ignore diff --git a/src/chocolatey.resources/redirects/cpush.exe b/src/chocolatey.resources/redirects/choco-push.exe similarity index 95% rename from src/chocolatey.resources/redirects/cpush.exe rename to src/chocolatey.resources/redirects/choco-push.exe index 850bdd20b7c5a2875440c419dc992b51ca5d8799..877f40b0212ff85bff618c99b1525140d43fba40 100644 GIT binary patch delta 35 ncmZoz!O^vXW5aS8){Ok*eBI5{%w}Pw?ZQfoZ$AP6?3)b! delta 23 fcmeBL!O^gSW5aTp&1+)w#zCpzWoRQajyws diff --git a/src/chocolatey.resources/redirects/cpush.exe.ignore b/src/chocolatey.resources/redirects/choco-push.exe.ignore similarity index 100% rename from src/chocolatey.resources/redirects/cpush.exe.ignore rename to src/chocolatey.resources/redirects/choco-push.exe.ignore diff --git a/src/chocolatey.resources/redirects/cuninst.exe b/src/chocolatey.resources/redirects/choco-uninst.exe similarity index 95% rename from src/chocolatey.resources/redirects/cuninst.exe rename to src/chocolatey.resources/redirects/choco-uninst.exe index a6e9eab1f176b21ec2d5f653de62975387be464e..35f7a7f07b09befbd4f1671c5ac2401292e27976 100644 GIT binary patch delta 35 ncmZoz!O^vXW5aS8){Ok*eBI5_|+f2 delta 23 fcmeBL!O^gSW5aTp&1+<`SevDlwo5B9zW)dSaf1n6 diff --git a/src/chocolatey.resources/redirects/cup.exe.ignore b/src/chocolatey.resources/redirects/choco-up.exe.ignore similarity index 100% rename from src/chocolatey.resources/redirects/cup.exe.ignore rename to src/chocolatey.resources/redirects/choco-up.exe.ignore diff --git a/src/chocolatey.resources/redirects/cver.exe b/src/chocolatey.resources/redirects/choco-ver.exe similarity index 95% rename from src/chocolatey.resources/redirects/cver.exe rename to src/chocolatey.resources/redirects/choco-ver.exe index d1f7f483e58dc1125fc26105ccb23abd7bd5456b..6df0456db348ab59ef890d3f07afabcc44702547 100644 GIT binary patch delta 35 ncmZoz!O^vXW5aS8){Ok*eBI5+(m?0*dW delta 23 fcmeBL!O^gSW5aTp&1+<`S({~)w#z6nzWWFOahVBU diff --git a/src/chocolatey.resources/redirects/cver.exe.ignore b/src/chocolatey.resources/redirects/choco-ver.exe.ignore similarity index 100% rename from src/chocolatey.resources/redirects/cver.exe.ignore rename to src/chocolatey.resources/redirects/choco-ver.exe.ignore diff --git a/src/chocolatey/infrastructure.app/commands/ChocolateyListCommand.cs b/src/chocolatey/infrastructure.app/commands/ChocolateyListCommand.cs index 37d3f6806b..1902b30964 100644 --- a/src/chocolatey/infrastructure.app/commands/ChocolateyListCommand.cs +++ b/src/chocolatey/infrastructure.app/commands/ChocolateyListCommand.cs @@ -152,7 +152,7 @@ public virtual void help_message(ChocolateyConfiguration configuration) this.Log().Info(ChocolateyLoggers.Important, "List/Search Command"); this.Log().Info(@" Chocolatey will perform a search for a package local or remote. Some - may prefer to use `clist` as a shortcut for `choco list`. + may prefer to use `choco-list` as a shortcut for `choco list`. NOTE: 100% compatible with older Chocolatey client (0.9.8.x and below) with options and switches. In most cases you can still pass options @@ -164,7 +164,7 @@ the command reference (`choco -?`). "chocolatey".Log().Info(@" choco search [] choco list [] - clist [] + choco-list [] "); "chocolatey".Log().Info(ChocolateyLoggers.Important, "Examples"); diff --git a/src/chocolatey/infrastructure.app/commands/ChocolateyPackCommand.cs b/src/chocolatey/infrastructure.app/commands/ChocolateyPackCommand.cs index b3cef3f13b..fe09d6c38c 100644 --- a/src/chocolatey/infrastructure.app/commands/ChocolateyPackCommand.cs +++ b/src/chocolatey/infrastructure.app/commands/ChocolateyPackCommand.cs @@ -82,7 +82,7 @@ public virtual void help_message(ChocolateyConfiguration configuration) this.Log().Info(ChocolateyLoggers.Important, "Pack Command"); this.Log().Info(@" Chocolatey will attempt to package a nuspec into a compiled nupkg. Some - may prefer to use `cpack` as a shortcut for `choco pack`. + may prefer to use `choco-pack` as a shortcut for `choco pack`. NOTE: 100% compatible with older chocolatey client (0.9.8.32 and below) with options and switches. In most cases you can still pass options @@ -92,7 +92,7 @@ the command reference (`choco -?`). NOTE: You can pass arbitrary property value pairs through to nuspecs. These will replace variables formatted as `$property$` with the value passed. -NOTE: `cpack` has been deprecated as it has a name collision with CMake. Please +NOTE: `choco-pack` has been deprecated as it has a name collision with CMake. Please use `choco pack` instead. The shortcut will be removed in v1. "); @@ -100,7 +100,7 @@ These will replace variables formatted as `$property$` with the value passed. "chocolatey".Log().Info(ChocolateyLoggers.Important, "Usage"); "chocolatey".Log().Info(@" choco pack [] [] [] - cpack [] [] (DEPRECATED) + choco-pack [] [] (DEPRECATED) "); "chocolatey".Log().Info(ChocolateyLoggers.Important, "Examples"); diff --git a/src/chocolatey/infrastructure.app/commands/ChocolateyPushCommand.cs b/src/chocolatey/infrastructure.app/commands/ChocolateyPushCommand.cs index 6ec0e0e0dd..21e5c42d28 100644 --- a/src/chocolatey/infrastructure.app/commands/ChocolateyPushCommand.cs +++ b/src/chocolatey/infrastructure.app/commands/ChocolateyPushCommand.cs @@ -148,7 +148,7 @@ public virtual void help_message(ChocolateyConfiguration configuration) this.Log().Info(ChocolateyLoggers.Important, "Push Command"); this.Log().Info(@" Chocolatey will attempt to push a compiled nupkg to a package feed. - Some may prefer to use `cpush` as a shortcut for `choco push`. + Some may prefer to use `choco-push` as a shortcut for `choco push`. NOTE: 100% compatible with older chocolatey client (0.9.8.32 and below) with options and switches. Default push location is deprecated and @@ -165,7 +165,7 @@ the command reference (`choco -?`). "chocolatey".Log().Info(ChocolateyLoggers.Important, "Usage"); "chocolatey".Log().Info(@" choco push [] [] - cpush [] [] + choco-push [] [] NOTE: If there is more than one nupkg file in the folder, the command will require specifying the path to the file. diff --git a/src/chocolatey/infrastructure.app/commands/ChocolateyUninstallCommand.cs b/src/chocolatey/infrastructure.app/commands/ChocolateyUninstallCommand.cs index e6c67a84e4..e155df732d 100644 --- a/src/chocolatey/infrastructure.app/commands/ChocolateyUninstallCommand.cs +++ b/src/chocolatey/infrastructure.app/commands/ChocolateyUninstallCommand.cs @@ -155,7 +155,7 @@ public virtual void help_message(ChocolateyConfiguration configuration) this.Log().Info(ChocolateyLoggers.Important, "Uninstall Command"); this.Log().Info(@" Uninstalls a package or a list of packages. Some may prefer to use - `cuninst` as a shortcut for `choco uninstall`. + `choco-uninst` as a shortcut for `choco uninstall`. NOTE: 100% compatible with older chocolatey client (0.9.8.32 and below) with options and switches. Add `-y` for previous behavior with no @@ -207,7 +207,7 @@ to determine how to automatically uninstall software. "chocolatey".Log().Info(ChocolateyLoggers.Important, "Usage"); "chocolatey".Log().Info(@" choco uninstall [pkg2 pkgN] [options/switches] - cuninst [pkg2 pkgN] [options/switches] + choco-uninst [pkg2 pkgN] [options/switches] NOTE: `all` is a special package keyword that will allow you to uninstall all packages. diff --git a/src/chocolatey/infrastructure.app/commands/ChocolateyUpgradeCommand.cs b/src/chocolatey/infrastructure.app/commands/ChocolateyUpgradeCommand.cs index f8a4c31f6a..0e566aac6f 100644 --- a/src/chocolatey/infrastructure.app/commands/ChocolateyUpgradeCommand.cs +++ b/src/chocolatey/infrastructure.app/commands/ChocolateyUpgradeCommand.cs @@ -269,7 +269,7 @@ public virtual void help_message(ChocolateyConfiguration configuration) { this.Log().Info(ChocolateyLoggers.Important, "Upgrade Command"); this.Log().Info(@" -Upgrades a package or a list of packages. Some may prefer to use `cup` +Upgrades a package or a list of packages. Some may prefer to use `choco-up` as a shortcut for `choco upgrade`. If you do not have a package installed, upgrade will install it. @@ -282,7 +282,7 @@ prompt. In most cases you can still pass options and switches with one "chocolatey".Log().Info(ChocolateyLoggers.Important, "Usage"); "chocolatey".Log().Info(@" choco upgrade [ ] [] - cup [ ] [] + choco-up [ ] [] NOTE: `all` is a special package keyword that will allow you to upgrade all currently installed packages. diff --git a/src/chocolatey/infrastructure.app/commands/ChocolateyVersionCommand.cs b/src/chocolatey/infrastructure.app/commands/ChocolateyVersionCommand.cs index 5091cd474d..826b3bcd2f 100644 --- a/src/chocolatey/infrastructure.app/commands/ChocolateyVersionCommand.cs +++ b/src/chocolatey/infrastructure.app/commands/ChocolateyVersionCommand.cs @@ -24,7 +24,7 @@ namespace chocolatey.infrastructure.app.commands using logging; using services; - [CommandFor("version", "[DEPRECATED] will be removed in v1 - use `choco outdated` or `cup -whatif` instead")] + [CommandFor("version", "[DEPRECATED] will be removed in v1 - use `choco outdated` or `choco-up -whatif` instead")] public class ChocolateyVersionCommand : ChocolateyUpgradeCommand { private readonly IChocolateyPackageService _packageService;