diff --git a/nuget/chocolatey/tools/chocolateysetup.psm1 b/nuget/chocolatey/tools/chocolateysetup.psm1
index 6dd5334074..1cd5d0c9c3 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", "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..1dff88d054 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 install pester -version 2.0.2
diff --git a/src/chocolatey.resources/chocolatey.resources.csproj b/src/chocolatey.resources/chocolatey.resources.csproj
index 7ab50de40a..7c37ebacc1 100644
--- a/src/chocolatey.resources/chocolatey.resources.csproj
+++ b/src/chocolatey.resources/chocolatey.resources.csproj
@@ -82,13 +82,6 @@
-
-
-
-
-
-
-
@@ -96,13 +89,6 @@
-
-
-
-
-
-
-
diff --git a/src/chocolatey.resources/redirects/cinst.exe b/src/chocolatey.resources/redirects/cinst.exe
deleted file mode 100644
index 451e22b227..0000000000
Binary files a/src/chocolatey.resources/redirects/cinst.exe and /dev/null differ
diff --git a/src/chocolatey.resources/redirects/cinst.exe.ignore b/src/chocolatey.resources/redirects/cinst.exe.ignore
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/chocolatey.resources/redirects/clist.exe b/src/chocolatey.resources/redirects/clist.exe
deleted file mode 100644
index d6ca4917c9..0000000000
Binary files a/src/chocolatey.resources/redirects/clist.exe and /dev/null differ
diff --git a/src/chocolatey.resources/redirects/clist.exe.ignore b/src/chocolatey.resources/redirects/clist.exe.ignore
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/chocolatey.resources/redirects/cpack.exe b/src/chocolatey.resources/redirects/cpack.exe
deleted file mode 100644
index 1ddea401f8..0000000000
Binary files a/src/chocolatey.resources/redirects/cpack.exe and /dev/null differ
diff --git a/src/chocolatey.resources/redirects/cpack.exe.ignore b/src/chocolatey.resources/redirects/cpack.exe.ignore
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/chocolatey.resources/redirects/cpush.exe b/src/chocolatey.resources/redirects/cpush.exe
deleted file mode 100644
index 850bdd20b7..0000000000
Binary files a/src/chocolatey.resources/redirects/cpush.exe and /dev/null differ
diff --git a/src/chocolatey.resources/redirects/cpush.exe.ignore b/src/chocolatey.resources/redirects/cpush.exe.ignore
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/chocolatey.resources/redirects/cuninst.exe b/src/chocolatey.resources/redirects/cuninst.exe
deleted file mode 100644
index a6e9eab1f1..0000000000
Binary files a/src/chocolatey.resources/redirects/cuninst.exe and /dev/null differ
diff --git a/src/chocolatey.resources/redirects/cuninst.exe.ignore b/src/chocolatey.resources/redirects/cuninst.exe.ignore
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/chocolatey.resources/redirects/cup.exe b/src/chocolatey.resources/redirects/cup.exe
deleted file mode 100644
index 4769b4605a..0000000000
Binary files a/src/chocolatey.resources/redirects/cup.exe and /dev/null differ
diff --git a/src/chocolatey.resources/redirects/cup.exe.ignore b/src/chocolatey.resources/redirects/cup.exe.ignore
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/chocolatey.resources/redirects/cver.exe b/src/chocolatey.resources/redirects/cver.exe
deleted file mode 100644
index d1f7f483e5..0000000000
Binary files a/src/chocolatey.resources/redirects/cver.exe and /dev/null differ
diff --git a/src/chocolatey.resources/redirects/cver.exe.ignore b/src/chocolatey.resources/redirects/cver.exe.ignore
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs b/src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs
index 28cd769000..0fdb3b6c92 100644
--- a/src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs
+++ b/src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs
@@ -507,8 +507,7 @@ compatibility across different versions and editions of Chocolatey.
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`.
+ * For consistency, always use `choco`, not `choco.exe`.
* Always have the command as the first argument to `choco. e.g.
`choco install`, where `install` is the command.
* If there is a subcommand, ensure that is the second argument. e.g.
diff --git a/src/chocolatey/infrastructure.app/commands/ChocolateyInstallCommand.cs b/src/chocolatey/infrastructure.app/commands/ChocolateyInstallCommand.cs
index ba9cf33556..10cfe94894 100644
--- a/src/chocolatey/infrastructure.app/commands/ChocolateyInstallCommand.cs
+++ b/src/chocolatey/infrastructure.app/commands/ChocolateyInstallCommand.cs
@@ -238,8 +238,7 @@ public virtual void help_message(ChocolateyConfiguration configuration)
this.Log().Info(ChocolateyLoggers.Important, "Install Command");
this.Log().Info(@"
Installs a package or a list of packages (sometimes specified as a
- packages.config). Some may prefer to use `cinst` as a shortcut for
- `choco install`.
+ packages.config).
NOTE: 100% compatible with older chocolatey client (0.9.8.32 and below)
with options and switches. Add `-y` for previous behavior with no
@@ -250,7 +249,6 @@ prompt. In most cases you can still pass options and switches with one
"chocolatey".Log().Info(ChocolateyLoggers.Important, "Usage");
"chocolatey".Log().Info(@"
choco install [ ] []
- cinst [ ] []
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/src/chocolatey/infrastructure.app/commands/ChocolateyListCommand.cs b/src/chocolatey/infrastructure.app/commands/ChocolateyListCommand.cs
index 37d3f6806b..b94d548441 100644
--- a/src/chocolatey/infrastructure.app/commands/ChocolateyListCommand.cs
+++ b/src/chocolatey/infrastructure.app/commands/ChocolateyListCommand.cs
@@ -151,8 +151,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`.
+Chocolatey will perform a search for a package local or remote.
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 +163,6 @@ the command reference (`choco -?`).
"chocolatey".Log().Info(@"
choco search []
choco list []
- clist []
");
"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..711103c461 100644
--- a/src/chocolatey/infrastructure.app/commands/ChocolateyPackCommand.cs
+++ b/src/chocolatey/infrastructure.app/commands/ChocolateyPackCommand.cs
@@ -81,8 +81,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`.
+Chocolatey will attempt to package a nuspec into a compiled nupkg.
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,9 +91,6 @@ 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
- use `choco pack` instead. The shortcut will be removed in v1.
-
");
"chocolatey".Log().Info(ChocolateyLoggers.Important, "Usage");
diff --git a/src/chocolatey/infrastructure.app/commands/ChocolateyPushCommand.cs b/src/chocolatey/infrastructure.app/commands/ChocolateyPushCommand.cs
index 6ec0e0e0dd..9af63d7272 100644
--- a/src/chocolatey/infrastructure.app/commands/ChocolateyPushCommand.cs
+++ b/src/chocolatey/infrastructure.app/commands/ChocolateyPushCommand.cs
@@ -147,8 +147,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`.
+Chocolatey will attempt to push a compiled nupkg to a package feed.
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 +164,6 @@ the command reference (`choco -?`).
"chocolatey".Log().Info(ChocolateyLoggers.Important, "Usage");
"chocolatey".Log().Info(@"
choco push [] []
- cpush [] []
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..b0bd92cda8 100644
--- a/src/chocolatey/infrastructure.app/commands/ChocolateyUninstallCommand.cs
+++ b/src/chocolatey/infrastructure.app/commands/ChocolateyUninstallCommand.cs
@@ -154,8 +154,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`.
+Uninstalls a package or a list of packages.
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 +206,6 @@ 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]
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..9118812b6d 100644
--- a/src/chocolatey/infrastructure.app/commands/ChocolateyUpgradeCommand.cs
+++ b/src/chocolatey/infrastructure.app/commands/ChocolateyUpgradeCommand.cs
@@ -269,8 +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`
- as a shortcut for `choco upgrade`. If you do not have a package
+Upgrades a package or a list of packages. If you do not have a package
installed, upgrade will install it.
NOTE: 100% compatible with older Chocolatey client (0.9.8.x and below)
@@ -282,7 +281,6 @@ 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 [ ] []
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..6f24f3617e 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 upgrade -whatif` instead")]
public class ChocolateyVersionCommand : ChocolateyUpgradeCommand
{
private readonly IChocolateyPackageService _packageService;