From 6931d5285817f528d314369629d7762ab2a7e1a2 Mon Sep 17 00:00:00 2001 From: Basil Peace Date: Fri, 20 Apr 2018 21:18:51 +0300 Subject: [PATCH 01/19] (doc) Fix typo and language in Contributing guidelines --- CONTRIBUTING.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ae52677714..cbe1fc7d3c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -32,9 +32,9 @@ The Chocolatey team has very explicit information here regarding the process for ## Are You In the Right Place? -Chocolatey is a large ecosystem and each component has their own location for submitting issues and enhancement requests. While the website (the community package repository) may be all your know for packages, it represents only a tiny fraction of existing packages (organizations typically maintain and host their own packages internally). This is the repository for choco.exe (the client CLI tool) for Chocolatey, which spans multiple types of environments. +Chocolatey is a large ecosystem and each component has their own location for submitting issues and enhancement requests. While the website (the community package repository) may be all you know for packages, it represents only a tiny fraction of existing packages (organizations typically maintain and host their own packages internally). This is the repository for choco.exe (the client CLI tool) for Chocolatey, which spans multiple types of environments. -Please follow this decision criteria to see if you are in the right location or if you should head to a different location to submit your request. +Please follow these decision criteria to see if you are in the right location or if you should head to a different location to submit your request. ### Reporting an Issue/Bug? ![submitting isseus](https://cloud.githubusercontent.com/assets/63502/12534440/fc223b74-c21e-11e5-9a41-1ffc1c9af48f.png) @@ -54,7 +54,7 @@ If you are looking for packages to be added to the community feed (aka https://c If this is for choco (the CLI tool), this is the right place. See below. Otherwise see [Submitting Issues](https://github.com/chocolatey/choco#submitting-issues) for enhancements to the website, enhancements to the ChocolateyGUI, etc. #### Submitting an Enhancement For Choco -Log a github issue. There are less constraints on this versus reporting issues. +Log a github issue. There are fewer constraints on this versus reporting issues. ## Contributing The process for contributions is roughly as follows: @@ -262,7 +262,7 @@ Submitting PR: * One of the Chocolatey Team members, or one of the committers, will evaluate it within a reasonable time period (which is to say usually within 2-4 weeks). Some things get evaluated faster or fast tracked. We are human and we have active lives outside of open source so don't fret if you haven't seen any activity on your pull request within a month or two. We don't have a Service Level Agreement (SLA) for pull requests. Just know that we will evaluate your pull request. ### Respond to Feedback on Pull Request -We may have feedback for you in the form of reuqested changes or fixes. We generally like to see that pushed against the same topic branch (it will automatically update the PR). You can also fix/squash/rebase commits and push the same topic branch with `--force` (while it is generally acceptable to do this on topic branches not in the main repository, a force push should be avoided at all costs against the main repository). +We may have feedback for you in the form of requested changes or fixes. We generally like to see that pushed against the same topic branch (it will automatically update the PR). You can also fix/squash/rebase commits and push the same topic branch with `--force` (while it is generally acceptable to do this on topic branches not in the main repository, a force push should be avoided at all costs against the main repository). If we have comments or questions when we do evaluate it and receive no response, it will probably lessen the chance of getting accepted. Eventually this means it will be closed if it is not accepted. Please know this doesn't mean we don't value your contribution, just that things go stale. If in the future you want to pick it back up, feel free to address our concerns/questions/feedback and reopen the issue/open a new PR (referencing old one). From 9f1cb7dce5d19aa959964dbb7cf9ff08bc6b6ac7 Mon Sep 17 00:00:00 2001 From: Paul Broadwith Date: Mon, 13 Aug 2018 10:31:35 +0100 Subject: [PATCH 02/19] (doc) Fix invalid url --- COMMITTERS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/COMMITTERS.md b/COMMITTERS.md index 5ac6df4047..721d001ae5 100644 --- a/COMMITTERS.md +++ b/COMMITTERS.md @@ -64,7 +64,7 @@ Unless there is something wrong with the code, we don't ask contributors to reba ## Merging Once you have reviewed the change set and determined it is ready for merge, the next steps are to bring it local and evaluate the code further by actually working with it, running the tests locally and adding any additional commits or fix-ups that are necessary in a local branch. -When merging the user's contribution, it should be done with `git merge --log --no-ff` to create a merge commit so that in case there is an issue it becomes easier to revert later, and so that we can see where the code came from should we ever need to go find it later (more information on this can be found [here](https://www.kernel.org/pub/software/scm/git/docs/git-merge.html) and also a discussion on why this is a good idea [here](http://differential.io/blog/best-way-to-merge-a-github-pull-request)). +When merging the user's contribution, it should be done with `git merge --log --no-ff` to create a merge commit so that in case there is an issue it becomes easier to revert later, and so that we can see where the code came from should we ever need to go find it later (more information on this can be found [here](https://www.kernel.org/pub/software/scm/git/docs/git-merge.html) and also a discussion on why this is a good idea [here](https://differential.com/insights/best-way-to-merge-a-github-pull-request/)). ### Merge Retargeting to Stable Because we ask contributors to target master, sometimes a fix/enhancement may need to be retargeted to stable. This process is somewhat easy thanks to git. In most cases you won't even need to ask the user to do this for you. From bb9811a2a084339799f8c63d86f319cfc3eb13d6 Mon Sep 17 00:00:00 2001 From: Paul Broadwith Date: Mon, 13 Aug 2018 10:36:37 +0100 Subject: [PATCH 03/19] (doc) Fix typo --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ae52677714..178864c644 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -37,7 +37,7 @@ Chocolatey is a large ecosystem and each component has their own location for su Please follow this decision criteria to see if you are in the right location or if you should head to a different location to submit your request. ### Reporting an Issue/Bug? -![submitting isseus](https://cloud.githubusercontent.com/assets/63502/12534440/fc223b74-c21e-11e5-9a41-1ffc1c9af48f.png) +![submitting issues](https://cloud.githubusercontent.com/assets/63502/12534440/fc223b74-c21e-11e5-9a41-1ffc1c9af48f.png) Submitting an Issue (or a Bug)? See the **[Submitting Issues](https://github.com/chocolatey/choco#submitting-issues) section** in the [README](https://github.com/chocolatey/choco/blob/master/README.md#submitting-issues). From ff271c92331d75a1d1ee94c8625899057d095e5d Mon Sep 17 00:00:00 2001 From: Michael Fyffe <6224270+TraGicCode@users.noreply.github.com> Date: Tue, 2 Oct 2018 13:29:47 +0000 Subject: [PATCH 04/19] (doc) .NET Framework 3.5 Feature Required for windows builds In order to build on a windows machine you must have .NET Framework 3.5 installed ( typically done via the windows feature functionality ). Once installed building will continue to work. I assume this might be installed by default on desktop O/S's but not the default on newer Windows Server O/S's due to reducing the attack surface of a box This Closes #1650 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 7baf606053..b9ce6ccfd0 100644 --- a/README.md +++ b/README.md @@ -124,6 +124,7 @@ There is a `build.bat`/`build.sh` file that creates a necessary generated file n #### Windows Prerequisites: + * .NET Framework 3.5 (This is a windows feature installation). * .NET Framework 4+ * Visual Studio is helpful for working on source. * ReSharper is immensely helpful (and there is a `.sln.DotSettings` file to help with code conventions). From 91627a957bdf9648b67cd0c7a6746bfad875db4a Mon Sep 17 00:00:00 2001 From: Simon Sobisch Date: Mon, 3 Jun 2019 20:49:48 +0200 Subject: [PATCH 05/19] Update README.md removed gratipay "badge" as the service is [offline since End of 2017](https://gratipay.news/vive-la-liberapay-14057a25eacb) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b9ce6ccfd0..c58fe0fdf5 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ You can just call me choco. ![Chocolatey Logo](https://cdn.rawgit.com/chocolatey/choco/14a627932c78c8baaba6bef5f749ebfa1957d28d/docs/logo/chocolateyicon.gif "Chocolatey") -[![](https://img.shields.io/chocolatey/dt/chocolatey.svg)](https://chocolatey.org/packages/chocolatey) [![](https://img.shields.io/chocolatey/v/chocolatey.svg)](https://chocolatey.org/packages/chocolatey) [![](https://img.shields.io/gratipay/Chocolatey.svg)](https://www.gratipay.com/Chocolatey/) [![Project Stats](https://www.openhub.net/p/chocolatey/widgets/project_thin_badge.gif)](https://www.openhub.net/p/chocolatey) +[![](https://img.shields.io/chocolatey/dt/chocolatey.svg)](https://chocolatey.org/packages/chocolatey) [![](https://img.shields.io/chocolatey/v/chocolatey.svg)](https://chocolatey.org/packages/chocolatey) [![Project Stats](https://www.openhub.net/p/chocolatey/widgets/project_thin_badge.gif)](https://www.openhub.net/p/chocolatey) From 97249433628b532f4ea6da896a5fa52bdd6f855c Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Wed, 21 Aug 2019 08:03:48 +0100 Subject: [PATCH 06/19] (doc) Add security.md file This replaces that current issue template that we have specifically for security related issues. Instead of starting to create a new issue, which is what happens currently, this will simply display the policy to the user. --- .github/ISSUE_TEMPLATE/SecurityDisclosure.md | 8 -------- .github/SECURITY.md | 6 ++++++ 2 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/SecurityDisclosure.md create mode 100644 .github/SECURITY.md diff --git a/.github/ISSUE_TEMPLATE/SecurityDisclosure.md b/.github/ISSUE_TEMPLATE/SecurityDisclosure.md deleted file mode 100644 index 5429941268..0000000000 --- a/.github/ISSUE_TEMPLATE/SecurityDisclosure.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: Security Disclosure / Report -about: Found a security issue? ---- - -STOP RIGHT HERE - DO NOT CREATE A TICKET FOR A SECURITY FINDING IN THE OPEN (HERE OR IN ANY COMMUNITY) - -Security reports should never start out in the open. Please follow up directly with the team if you have a contact. If not you can always start with the information at https://chocolatey.org/security to see instructions on how to provide the disclosure. Thank you! diff --git a/.github/SECURITY.md b/.github/SECURITY.md new file mode 100644 index 0000000000..fc8bb5354b --- /dev/null +++ b/.github/SECURITY.md @@ -0,0 +1,6 @@ +# Security Policies and Procedures + +Security reports should never start out in the open. Please follow up directly +with the team if you have a contact. If not you can always start with the +information at https://chocolatey.org/security to see instructions on how to +provide the disclosure. Thank you! From 9da5f2fde368e4d81d3a18f143b99e8271d62fc2 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Mon, 2 Sep 2019 14:36:13 +0100 Subject: [PATCH 07/19] (build) Change to start building next version of Chocolatey These changes mean that going forward, each CI build of Chocolatey will have a unique package version number, rather than creating the same package version for different commits on the same day. To facilitate this, the version.fix parameter can be used to pass in something like the build counter variable of the CI system being used. --- .build/nugetBuild.step | 3 ++- .uppercut | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.build/nugetBuild.step b/.build/nugetBuild.step index 1c99fad746..71b5417451 100644 --- a/.build/nugetBuild.step +++ b/.build/nugetBuild.step @@ -41,7 +41,8 @@ - + + diff --git a/.uppercut b/.uppercut index 74fe8cbee9..f61fe8071c 100644 --- a/.uppercut +++ b/.uppercut @@ -17,10 +17,10 @@ - + - - + + From 74f416faad5789a4d2d31fa29a262d8979446344 Mon Sep 17 00:00:00 2001 From: Pascal Berger Date: Fri, 3 Jan 2020 15:23:09 +0100 Subject: [PATCH 08/19] Add missing start of comment block --- .github/ISSUE_TEMPLATE/zChocoReportIssue.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/zChocoReportIssue.md b/.github/ISSUE_TEMPLATE/zChocoReportIssue.md index 121c021176..635a787ea7 100644 --- a/.github/ISSUE_TEMPLATE/zChocoReportIssue.md +++ b/.github/ISSUE_TEMPLATE/zChocoReportIssue.md @@ -3,6 +3,7 @@ name: Choco.exe - Report Issue about: Did you find unexpected behavior? --- + @@ -72,7 +72,7 @@ public class NuspecTemplate __REPLACE__ __REPLACE__MarkDown_Okay [[AutomaticPackageNotesNuspec]] - + nuget apt-get machine repository chocolatey @@ -31,10 +31,10 @@ You can host your own sources and add them to Chocolatey, you can extend Chocola * [Mailing List](http://groups.google.com/group/chocolatey) / [Release Announcements Only Mailing List](https://groups.google.com/group/chocolatey-announce) / [Build Status Mailing List](http://groups.google.com/group/chocolatey-build-status) * [Twitter](https://twitter.com/chocolateynuget) / [Facebook](https://www.facebook.com/ChocolateySoftware) / [Github](https://github.com/chocolatey) * [Blog](https://chocolatey.org/blog) / [Newsletter](https://chocolatey.us8.list-manage1.com/subscribe?u=86a6d80146a0da7f2223712e4&id=73b018498d) - * [Documentation](https://chocolatey.org/docs) / [Support](https://chocolatey.org/support) + * [Documentation](https://docs.chocolatey.org/en-us/) / [Support](https://chocolatey.org/support) ### Commands -There are quite a few commands you can call - you should check out the [command reference](https://chocolatey.org/docs/commands-reference). Here are the most common: +There are quite a few commands you can call - you should check out the [command reference](https://docs.chocolatey.org/en-us/choco/commands). Here are the most common: * Help - choco -? or choco command -? * Search - choco search something @@ -53,12 +53,12 @@ There are quite a few commands you can call - you should check out the [command * Install webpi feature - choco install IIS7.5Express -source webpi #### More -For more advanced commands and switches, use `choco -?` or `choco command -h`. You can also look at the [command reference](https://chocolatey.org/docs/commands-reference), including how you can force a package to install the x86 version of a package. +For more advanced commands and switches, use `choco -?` or `choco command -h`. You can also look at the [command reference](https://docs.chocolatey.org/en-us/choco/commands), including how you can force a package to install the x86 version of a package. ### Create Packages? -We have some great guidance on how to do that. Where? I'll give you a hint, it rhymes with socks! [Docs!](https://chocolatey.org/docs/create-packages) +We have some great guidance on how to do that. Where? I'll give you a hint, it rhymes with socks! [Docs!](https://docs.chocolatey.org/en-us/create/create-packages) -In that mess there is a link to the [PowerShell Chocolatey module reference](https://chocolatey.org/docs/helpers-reference). +In that mess there is a link to the [PowerShell Chocolatey module reference](https://docs.chocolatey.org/en-us/create/functions). See all - https://github.com/chocolatey/choco/blob/stable/CHANGELOG.md diff --git a/src/chocolatey.resources/helpers/functions/Get-FtpFile.ps1 b/src/chocolatey.resources/helpers/functions/Get-FtpFile.ps1 index 61cc1ff93d..731d97edd1 100644 --- a/src/chocolatey.resources/helpers/functions/Get-FtpFile.ps1 +++ b/src/chocolatey.resources/helpers/functions/Get-FtpFile.ps1 @@ -192,7 +192,7 @@ param( Set-PowerShellExitCode 404 if ($env:DownloadCacheAvailable -eq 'true') { - throw "The remote file either doesn't exist, is unauthorized, or is forbidden for url '$url'. $($_.Exception.Message) `nThis package is likely not broken for licensed users - see https://chocolatey.org/docs/features-private-cdn." + throw "The remote file either doesn't exist, is unauthorized, or is forbidden for url '$url'. $($_.Exception.Message) `nThis package is likely not broken for licensed users - see https://docs.chocolatey.org/en-us/features/private-cdn." } else { throw "The remote file either doesn't exist, is unauthorized, or is forbidden for url '$url'. $($_.Exception.Message)" } diff --git a/src/chocolatey.resources/helpers/functions/Get-PackageParameters.ps1 b/src/chocolatey.resources/helpers/functions/Get-PackageParameters.ps1 index 7553abd2b4..9be76f22dc 100644 --- a/src/chocolatey.resources/helpers/functions/Get-PackageParameters.ps1 +++ b/src/chocolatey.resources/helpers/functions/Get-PackageParameters.ps1 @@ -34,7 +34,7 @@ use in package scripts. By default this will look at (`--package-parameters-sensitive="'/PASSWORD:value'"` in commercial editions). -Learn more about using this at https://chocolatey.org/docs/how-to-parse-package-parameters-argument +Learn more about using this at https://docs.chocolatey.org/en-us/guides/create/parse-packageparameters-argument .NOTES Available in 0.10.8+. If you need compatibility with older versions, @@ -42,7 +42,7 @@ take a dependency on the `chocolatey-core.extension` package which also provides this functionality. If you are pushing to the community package repository (https://chocolatey.org/packages), you are required to take a dependency on the core extension until January 2018. How to -do this is explained at https://chocolatey.org/docs/how-to-parse-package-parameters-argument#step-3---use-core-community-extension. +do this is explained at https://docs.chocolatey.org/en-us/guides/create/parse-packageparameters-argument#step-3---use-core-community-extension. The differences between this and the `chocolatey-core.extension` package functionality is that the extension function can only do one string at a @@ -86,7 +86,7 @@ $pp = Get-PackageParameters .EXAMPLE > -# see https://chocolatey.org/docs/how-to-parse-package-parameters-argument +# see https://docs.chocolatey.org/en-us/guides/create/parse-packageparameters-argument # command line call: `choco install --params "'/LICENSE:value'"` $pp = Get-PackageParameters # Read-Host, PromptForChoice, etc are not blocking calls with Chocolatey. diff --git a/src/chocolatey.resources/helpers/functions/Get-WebFile.ps1 b/src/chocolatey.resources/helpers/functions/Get-WebFile.ps1 index 2a70cc543f..5bcb20c6cc 100644 --- a/src/chocolatey.resources/helpers/functions/Get-WebFile.ps1 +++ b/src/chocolatey.resources/helpers/functions/Get-WebFile.ps1 @@ -326,7 +326,7 @@ param( Set-PowerShellExitCode 404 if ($env:DownloadCacheAvailable -eq 'true') { - throw "The remote file either doesn't exist, is unauthorized, or is forbidden for url '$url'. $($_.Exception.Message) `nThis package is likely not broken for licensed users - see https://chocolatey.org/docs/features-private-cdn." + throw "The remote file either doesn't exist, is unauthorized, or is forbidden for url '$url'. $($_.Exception.Message) `nThis package is likely not broken for licensed users - see https://docs.chocolatey.org/en-us/features/private-cdn." } else { throw "The remote file either doesn't exist, is unauthorized, or is forbidden for url '$url'. $($_.Exception.Message)" } diff --git a/src/chocolatey/infrastructure.app/commands/ChocolateyInstallCommand.cs b/src/chocolatey/infrastructure.app/commands/ChocolateyInstallCommand.cs index b04abd5b1a..e726e6e427 100644 --- a/src/chocolatey/infrastructure.app/commands/ChocolateyInstallCommand.cs +++ b/src/chocolatey/infrastructure.app/commands/ChocolateyInstallCommand.cs @@ -410,10 +410,10 @@ on the local machine. "chocolatey".Log().Info(@" * How-To: A complete example of how you can use the PackageParameters argument when creating a Chocolatey Package can be seen at - https://chocolatey.org/docs/how-to-parse-package-parameters-argument + https://docs.chocolatey.org/en-us/guides/create/parse-packageparameters-argument * One may want to override the default installation directory of a piece of software. See - https://chocolatey.org/docs/getting-started#overriding-default-install-directory-or-other-advanced-install-concepts. + https://docs.chocolatey.org/en-us/getting-started#overriding-default-install-directory-or-other-advanced-install-concepts. "); diff --git a/src/chocolatey/infrastructure.app/services/NugetService.cs b/src/chocolatey/infrastructure.app/services/NugetService.cs index 892e3a7352..95a20a6129 100644 --- a/src/chocolatey/infrastructure.app/services/NugetService.cs +++ b/src/chocolatey/infrastructure.app/services/NugetService.cs @@ -484,7 +484,7 @@ public virtual ConcurrentDictionary install_run(Chocolate Version was specified as '{0}'. It is possible that version does not exist for '{1}' at the source specified.".format_with(config.Version.to_string(), packageName), @" -Please see https://chocolatey.org/docs/troubleshooting for more +Please see https://docs.chocolatey.org/en-us/troubleshooting for more assistance."); this.Log().Error(ChocolateyLoggers.Important, logMessage); var noPkgResult = packageInstalls.GetOrAdd(packageName, new PackageResult(packageName, version.to_string(), null)); diff --git a/src/chocolatey/infrastructure.app/templates/ChocolateyInstallTemplate.cs b/src/chocolatey/infrastructure.app/templates/ChocolateyInstallTemplate.cs index 51176bfbcb..2ba9f24a19 100644 --- a/src/chocolatey/infrastructure.app/templates/ChocolateyInstallTemplate.cs +++ b/src/chocolatey/infrastructure.app/templates/ChocolateyInstallTemplate.cs @@ -77,46 +77,46 @@ public class ChocolateyInstallTemplate #validExitCodes= @(0) #please insert other valid exit codes here } -Install-ChocolateyPackage @packageArgs # https://chocolatey.org/docs/helpers-install-chocolatey-package -#Install-ChocolateyZipPackage @packageArgs # https://chocolatey.org/docs/helpers-install-chocolatey-zip-package -## If you are making your own internal packages (organizations), you can embed the installer or +Install-ChocolateyPackage @packageArgs # https://docs.chocolatey.org/en-us/create/functions/install-chocolateypackage +#Install-ChocolateyZipPackage @packageArgs # https://docs.chocolatey.org/en-us/create/functions/install-chocolateyzippackage +## If you are making your own internal packages (organizations), you can embed the installer or ## put on internal file share and use the following instead (you'll need to add $file to the above) -#Install-ChocolateyInstallPackage @packageArgs # https://chocolatey.org/docs/helpers-install-chocolatey-install-package +#Install-ChocolateyInstallPackage @packageArgs # https://docs.chocolatey.org/en-us/create/functions/install-chocolateyinstallpackage ## Main helper functions - these have error handling tucked into them already -## see https://chocolatey.org/docs/helpers-reference +## see https://docs.chocolatey.org/en-us/create/functions ## Install an application, will assert administrative rights -## - https://chocolatey.org/docs/helpers-install-chocolatey-package -## - https://chocolatey.org/docs/helpers-install-chocolatey-install-package +## - https://docs.chocolatey.org/en-us/create/functions/install-chocolateypackage +## - https://docs.chocolatey.org/en-us/create/functions/install-chocolateyinstallpackage ## add additional optional arguments as necessary ##Install-ChocolateyPackage $packageName $fileType $silentArgs $url [$url64 -validExitCodes $validExitCodes -checksum $checksum -checksumType $checksumType -checksum64 $checksum64 -checksumType64 $checksumType64] -## Download and unpack a zip file - https://chocolatey.org/docs/helpers-install-chocolatey-zip-package +## Download and unpack a zip file - https://docs.chocolatey.org/en-us/create/functions/install-chocolateyzippackage ##Install-ChocolateyZipPackage $packageName $url $toolsDir [$url64 -checksum $checksum -checksumType $checksumType -checksum64 $checksum64 -checksumType64 $checksumType64] -## Install Visual Studio Package - https://chocolatey.org/docs/helpers-install-chocolatey-vsix-package +## Install Visual Studio Package - https://docs.chocolatey.org/en-us/create/functions/install-chocolateyvsixpackage #Install-ChocolateyVsixPackage $packageName $url [$vsVersion] [-checksum $checksum -checksumType $checksumType] #Install-ChocolateyVsixPackage @packageArgs -## see the full list at https://chocolatey.org/docs/helpers-reference +## see the full list at https://docs.chocolatey.org/en-us/create/functions ## downloader that the main helpers use to download items ## if removing $url64, please remove from here -## - https://chocolatey.org/docs/helpers-get-chocolatey-web-file +## - https://docs.chocolatey.org/en-us/create/functions/get-chocolateywebfile #Get-ChocolateyWebFile $packageName 'DOWNLOAD_TO_FILE_FULL_PATH' $url $url64 ## Installer, will assert administrative rights - used by Install-ChocolateyPackage ## use this for embedding installers in the package when not going to community feed or when you have distribution rights -## - https://chocolatey.org/docs/helpers-install-chocolatey-install-package +## - https://docs.chocolatey.org/en-us/create/functions/install-chocolateyinstallpackage #Install-ChocolateyInstallPackage $packageName $fileType $silentArgs '_FULLFILEPATH_' -validExitCodes $validExitCodes ## Unzips a file to the specified location - auto overwrites existing content -## - https://chocolatey.org/docs/helpers-get-chocolatey-unzip +## - https://docs.chocolatey.org/en-us/create/functions/get-chocolateyunzipp #Get-ChocolateyUnzip ""FULL_LOCATION_TO_ZIP.zip"" $toolsDir ## Runs processes asserting UAC, will assert administrative rights - used by Install-ChocolateyInstallPackage -## - https://chocolatey.org/docs/helpers-start-chocolatey-process-as-admin +## - https://docs.chocolatey.org/en-us/create/functions/start-chocolateyprocessasadmin #Start-ChocolateyProcessAsAdmin 'STATEMENTS_TO_RUN' 'Optional_Application_If_Not_PowerShell' -validExitCodes $validExitCodes ## To avoid quoting issues, you can also assemble your -Statements in another variable and pass it in @@ -128,29 +128,29 @@ public class ChocolateyInstallTemplate ## add specific folders to the path - any executables found in the chocolatey package ## folder will already be on the path. This is used in addition to that or for cases ## when a native installer doesn't add things to the path. -## - https://chocolatey.org/docs/helpers-install-chocolatey-path +## - https://docs.chocolatey.org/en-us/create/functions/install-chocolateypath #Install-ChocolateyPath 'LOCATION_TO_ADD_TO_PATH' 'User_OR_Machine' # Machine will assert administrative rights ## Add specific files as shortcuts to the desktop -## - https://chocolatey.org/docs/helpers-install-chocolatey-shortcut +## - https://docs.chocolatey.org/en-us/create/functions/install-chocolateyshortcut #$target = Join-Path $toolsDir ""$($packageName).exe"" # Install-ChocolateyShortcut -shortcutFilePath """" -targetPath """" [-workDirectory ""C:\"" -arguments ""C:\test.txt"" -iconLocation ""C:\test.ico"" -description ""This is the description""] ## Outputs the bitness of the OS (either ""32"" or ""64"") -## - https://chocolatey.org/docs/helpers-get-o-s-architecture-width +## - https://docs.chocolatey.org/en-us/create/functions/get-osarchitecturewidth #$osBitness = Get-ProcessorBits ## Set persistent Environment variables -## - https://chocolatey.org/docs/helpers-install-chocolatey-environment-variable +## - https://docs.chocolatey.org/en-us/create/functions/install-chocolateyenvironmentvariable #Install-ChocolateyEnvironmentVariable -variableName ""SOMEVAR"" -variableValue ""value"" [-variableType = 'Machine' #Defaults to 'User'] ## Set up a file association -## - https://chocolatey.org/docs/helpers-install-chocolatey-file-association -#Install-ChocolateyFileAssociation +## - https://docs.chocolatey.org/en-us/create/functions/install-chocolateyfileassociation +#Install-ChocolateyFileAssociation ## Adding a shim when not automatically found - Cocolatey automatically shims exe files found in package directory. -## - https://chocolatey.org/docs/helpers-install-bin-file -## - https://chocolatey.org/docs/create-packages#how-do-i-exclude-executables-from-getting-shims +## - https://docs.chocolatey.org/en-us/create/functions/install-binfile +## - https://docs.chocolatey.org/en-us/create/create-packages#how-do-i-exclude-executables-from-getting-shims #Install-BinFile ##PORTABLE EXAMPLE diff --git a/src/chocolatey/infrastructure.app/templates/ChocolateyReadMeTemplate.cs b/src/chocolatey/infrastructure.app/templates/ChocolateyReadMeTemplate.cs index d4b075924e..6e98320a4f 100644 --- a/src/chocolatey/infrastructure.app/templates/ChocolateyReadMeTemplate.cs +++ b/src/chocolatey/infrastructure.app/templates/ChocolateyReadMeTemplate.cs @@ -20,7 +20,7 @@ public class ChocolateyReadMeTemplate { public static string Template = @"## Summary -How do I create packages? See https://chocolatey.org/docs/create-packages +How do I create packages? See https://docs.chocolatey.org/en-us/create/create-packages If you are submitting packages to the community feed (https://chocolatey.org) always try to ensure you have read, understood and adhere to the create @@ -42,18 +42,18 @@ Shim generation runs whether the package is self-contained or uses automation If the application is a GUI, you should create an empty file next to the exe named 'name.exe.gui' e.g. 'bob.exe' would need a file named 'bob.exe.gui'. -See https://chocolatey.org/docs/create-packages#how-do-i-set-up-shims-for-applications-that-have-a-gui +See https://docs.chocolatey.org/en-us/create/create-packages#how-do-i-set-up-shims-for-applications-that-have-a-gui If you want to ignore the executable, create an empty file next to the exe named 'name.exe.ignore' e.g. 'bob.exe' would need a file named 'bob.exe.ignore'. -See https://chocolatey.org/docs/create-packages#how-do-i-exclude-executables-from-getting-shims +See https://docs.chocolatey.org/en-us/create/create-packages#how-do-i-exclude-executables-from-getting-shims ## Self-Contained? If you have a self-contained package, you can remove the automation scripts entirely and just include the executables, they will automatically get shimmed, which puts them on the path. Ensure you have the legal right to distribute -the application though. See https://chocolatey.org/docs/legal. +the application though. See https://docs.chocolatey.org/en-us/information/legal. You should read up on the Shim Generation section to familiarize yourself on what to do with GUI applications and/or ignoring shims. @@ -64,18 +64,18 @@ You should read up on the Shim Generation section to familiarize yourself functions that you can use, these are sometimes called the helpers. ### Built-In Functions -https://chocolatey.org/docs/helpers-reference +https://docs.chocolatey.org/en-us/create/functions A note about a couple: -* Get-BinRoot - this is a horribly named function that doesn't do what new folks think it does. It gets you the 'tools' root, which by default is set to 'c:\tools', not the chocolateyInstall bin folder - see https://chocolatey.org/docs/helpers-get-tools-location -* Install-BinFile - used for non-exe files - executables are automatically shimmed... - see https://chocolatey.org/docs/helpers-install-bin-file -* Uninstall-BinFile - used for non-exe files - executables are automatically shimmed - see https://chocolatey.org/docs/helpers-uninstall-bin-file +* Get-BinRoot - this is a horribly named function that doesn't do what new folks think it does. It gets you the 'tools' root, which by default is set to 'c:\tools', not the chocolateyInstall bin folder - see https://docs.chocolatey.org/en-us/create/functions/get-toolslocation +* Install-BinFile - used for non-exe files - executables are automatically shimmed... - see https://docs.chocolatey.org/en-us/create/functions/install-binfile +* Uninstall-BinFile - used for non-exe files - executables are automatically shimmed - see https://docs.chocolatey.org/en-us/create/functions/uninstall-binfile ### Getting package specific information -Use the package parameters pattern - see https://chocolatey.org/docs/how-to-parse-package-parameters-argument +Use the package parameters pattern - see https://docs.chocolatey.org/en-us/guides/create/parse-packageparameters-argument ### Need to mount an ISO? -https://chocolatey.org/docs/how-to-mount-an-iso-in-chocolatey-package +https://docs.chocolatey.org/en-us/guides/create/mount-an-iso-in-chocolatey-package ### Environment Variables Chocolatey makes a number of environment variables available (You can access any of these with $env:TheVariableNameBelow): diff --git a/src/chocolatey/infrastructure.app/templates/ChocolateyTodoTemplate.cs b/src/chocolatey/infrastructure.app/templates/ChocolateyTodoTemplate.cs index e392d9c5be..735a621171 100644 --- a/src/chocolatey/infrastructure.app/templates/ChocolateyTodoTemplate.cs +++ b/src/chocolatey/infrastructure.app/templates/ChocolateyTodoTemplate.cs @@ -32,11 +32,11 @@ into the tools directory (as long as total nupkg size is under 1GB). `Install-ChocolateyInstallPackage`/`Get-ChocolateyUnzip` in tools\chocolateyInstall.ps1. - https://chocolatey.org/docs/community-packages-disclaimer#organizations You can also choose to download from internal urls, see the next section, but ignore whether you have distribution rights or not, it doesn't apply. Under no circumstances should download from the internet, it is completely unreliable. See + https://docs.chocolatey.org/en-us/community-repository/community-packages-disclaimer to understand the limitations of a publicly available repository. Community Repository? @@ -58,7 +58,7 @@ Do Not Have Distribution Rights? - Note: Packages built this way cannot be 100% reliable, but it's a constraint of publicly available packages and there is little that can be done to change that. See - https://chocolatey.org/docs/community-packages-disclaimer#organizations + https://docs.chocolatey.org/en-us/community-repository/community-packages-disclaimer to better understand the limitations of a publicly available repository. Download Location is Publicly Available? @@ -90,10 +90,10 @@ secondary step. zip package) - cannot require administrative permissions to install or use - Config Package - sets config like files, registry keys, etc - Chocolatey - https://chocolatey.org/docs/how-to-create-extensions - Extension Package - Packages that add PowerShell functions to + Chocolatey - https://docs.chocolatey.org/en-us/features/extensions - Template Package - Packages that add templates like this for `choco - new -t=name` - https://chocolatey.org/docs/how-to-create-custom-package-templates + new -t=name` - https://docs.chocolatey.org/en-us/guides/create/create-custom-package-templates - Other - there are other types of packages as well, these are the main package types seen in the wild @@ -126,7 +126,7 @@ anything you've needed from here `Install-ChocolateyPackage` / `Install-ChocolateyZipPackage`. - Other needs (creating files, setting registry keys), use regular PowerShell to do so or see if there is a function already defined: - https://chocolatey.org/docs/helpers-reference + https://docs.chocolatey.org/en-us/create/functions - There may also be functions available in extension packages, see https://chocolatey.org/packages?q=id%3A.extension for examples and availability. diff --git a/src/chocolatey/infrastructure.app/templates/ChocolateyUninstallTemplate.cs b/src/chocolatey/infrastructure.app/templates/ChocolateyUninstallTemplate.cs index 0da33c57c4..764f91c499 100644 --- a/src/chocolatey/infrastructure.app/templates/ChocolateyUninstallTemplate.cs +++ b/src/chocolatey/infrastructure.app/templates/ChocolateyUninstallTemplate.cs @@ -25,8 +25,8 @@ public class ChocolateyUninstallTemplate ## NOTE: In 80-90% of the cases (95% with licensed versions due to Package Synchronizer and other enhancements), ## AutoUninstaller should be able to detect and handle registry uninstalls without a chocolateyUninstall.ps1. -## See https://chocolatey.org/docs/commands-uninstall -## and https://chocolatey.org/docs/helpers-uninstall-chocolatey-package +## See https://docs.chocolatey.org/en-us/choco/commands/uninstall +## and https://docs.chocolatey.org/en-us/create/functions/uninstall-chocolateypackage ## If this is an MSI, ensure 'softwareName' is appropriate, then clean up comments and you are done. ## If this is an exe, change fileType, silentArgs, and validExitCodes @@ -97,10 +97,10 @@ public class ChocolateyUninstallTemplate } ## OTHER POWERSHELL FUNCTIONS -## https://chocolatey.org/docs/helpers-reference -#Uninstall-ChocolateyZipPackage $packageName # Only necessary if you did not unpack to package directory - see https://chocolatey.org/docs/helpers-uninstall-chocolatey-zip-package -#Uninstall-ChocolateyEnvironmentVariable # 0.9.10+ - https://chocolatey.org/docs/helpers-uninstall-chocolatey-environment-variable -#Uninstall-BinFile # Only needed if you used Install-BinFile - see https://chocolatey.org/docs/helpers-uninstall-bin-file +## https://docs.chocolatey.org/en-us/create/functions +#Uninstall-ChocolateyZipPackage $packageName # Only necessary if you did not unpack to package directory - see https://docs.chocolatey.org/en-us/create/functions/uninstall-chocolateyzippackage +#Uninstall-ChocolateyEnvironmentVariable # 0.9.10+ - https://docs.chocolatey.org/en-us/create/functions/uninstall-chocolateyenvironmentvariable +#Uninstall-BinFile # Only needed if you used Install-BinFile - see https://docs.chocolatey.org/en-us/create/functions/uninstall-binfile ## Remove any shortcuts you added in the install script. "; diff --git a/src/chocolatey/infrastructure.app/templates/NuspecTemplate.cs b/src/chocolatey/infrastructure.app/templates/NuspecTemplate.cs index df5db285c6..9260c9f932 100644 --- a/src/chocolatey/infrastructure.app/templates/NuspecTemplate.cs +++ b/src/chocolatey/infrastructure.app/templates/NuspecTemplate.cs @@ -20,7 +20,7 @@ public class NuspecTemplate { public static string Template = @" - + diff --git a/src/chocolatey/infrastructure/licensing/License.cs b/src/chocolatey/infrastructure/licensing/License.cs index 777d55067e..e54889c6cf 100644 --- a/src/chocolatey/infrastructure/licensing/License.cs +++ b/src/chocolatey/infrastructure/licensing/License.cs @@ -64,7 +64,7 @@ that chocolatey.licensed.dll exists at as is and be successful. You need to download nupkgs from the links in the trial email as your license will not be registered on the licensed repository. Please reference - https://chocolatey.org/docs/installation-licensed#how-do-i-install-the-trial-edition + https://docs.chocolatey.org/en-us/licensed-extension/setup#how-do-i-install-the-trial-edition for specific instructions."); } } From eb30cef11038767da4ac456c2372d66d09080c81 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Thu, 15 Apr 2021 09:15:26 +0100 Subject: [PATCH 15/19] (maint) Remove unnecessary whitespace --- .../builders/ConfigurationBuilder.cs | 76 +++++++++---------- .../commands/ChocolateyApiKeyCommand.cs | 46 +++++------ .../commands/ChocolateySourceCommand.cs | 24 +++--- 3 files changed, 73 insertions(+), 73 deletions(-) diff --git a/src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs b/src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs index 184e033be4..6dbe098c6a 100644 --- a/src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs +++ b/src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs @@ -477,7 +477,7 @@ the local options are parsed. (`""value""`) but in powershell.exe you should use backticks (`` `""value`"" ``) or apostrophes (`'value'`). Using the combination allows for both shells to work without issue, except for when the next - section applies. + section applies. * **Pass quotes in arguments**: When you need to pass quoted values to to something like a native installer, you are in for a world of fun. In cmd.exe you must pass it like this: `-ia ""/yo=""""Spaces spaces""""""`. In @@ -499,32 +499,32 @@ wanting to pass specific options. When writing scripts, such as PowerShell scripts passing options and switches, there are some best practices to follow to ensure that you don't run into issues later. This also applies to integrations that -are calling Chocolatey and parsing output. Chocolatey **uses** +are calling Chocolatey and parsing output. Chocolatey **uses** PowerShell, but it is an exe, so it cannot return PowerShell objects. -Following these practices ensures both readability of your scripts AND -compatibility across different versions and editions of Chocolatey. -Following this guide will ensure your experience is not frustrating +Following these practices ensures both readability of your scripts AND +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 + * For consistency, always use `choco`, not `choco.exe`. Never use shortcut commands like `cinst` or `cup`. * 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. `choco source list`, where `source` is the command and `list` is the subcommand. - * Typically the subject comes next. If installing packages, the + * Typically the subject comes next. If installing packages, the subject would be the package names, e.g. `choco install pkg1 pkg2`. * Never use 'nupkg' or point directly to a nupkg file UNLESS using 'choco push'. Use the source folder instead, e.g. `choco install - --source=""'c:\folder\with\package'""` instead of - `choco install DoNotDoThis.1.0.nupkg` or `choco install DoNotDoThis + --source=""'c:\folder\with\package'""` instead of + `choco install DoNotDoThis.1.0.nupkg` or `choco install DoNotDoThis --source=""'c:\folder\with\package\DoNotDoThis.1.0.nupkg'""`. - * Switches and parameters are called simply options. Options come + * Switches and parameters are called simply options. Options come after the subject. e.g. `choco install pkg1 --debug --verbose`. * Never use the force option (`--force`/`-f`) in scripts (or really - otherwise as a default mode of use). Force is an override on + otherwise as a default mode of use). Force is an override on Chocolatey behavior. If you are wondering why Chocolatey isn't doing something like the documentation says it should, it's likely because you are using force. Stop. @@ -532,60 +532,60 @@ Chocolatey behavior. If you are wondering why Chocolatey isn't doing full option is `--name`, use `--name`. The only acceptable short option for use in scripts is `-y`. Find option names in help docs online or through `choco -?` /`choco [Command Name] -?`. - * For scripts that are running automated, always use `-y`. Do note + * For scripts that are running automated, always use `-y`. Do note that even with `-y` passed, some things / state issues detected will - temporarily stop for input - the key here is temporarily. They will + temporarily stop for input - the key here is temporarily. They will continue without requiring any action after the temporary timeout (typically 30 seconds). - * Full option names are prepended with two dashes, e.g. `--` or + * Full option names are prepended with two dashes, e.g. `--` or `--debug --verbose --ignore-proxy`. - * When setting a value to an option, always put an equals (`=`) + * When setting a value to an option, always put an equals (`=`) between the name and the setting, e.g. `--source=""'local'""`. - * When setting a value to an option, always surround the value - properly with double quotes bookending apostrophes, e.g. + * When setting a value to an option, always surround the value + properly with double quotes bookending apostrophes, e.g. `--source=""'internal_server'""`. - * If you are building PowerShell scripts, you can most likely just - simply use apostrophes surrounding option values, e.g. + * If you are building PowerShell scripts, you can most likely just + simply use apostrophes surrounding option values, e.g. `--source='internal_server'`. * Prefer upgrade to install in scripts. You can't `install` to a newer version of something, but you can `choco upgrade` which will do both upgrade or install (unless switched off explicitly). - * If you are sharing the script with others, pass `--source` to be - explicit about where the package is coming from. Use full link and not source name ('https://chocolatey.org/api/v2' versus + * If you are sharing the script with others, pass `--source` to be + explicit about where the package is coming from. Use full link and 'chocolatey'). - * If parsing output, you might want to use `--limit-output`/`-r` to - get output in a more machine parseable format. NOTE: Not all - commands handle return of information in an easily digestible + * If parsing output, you might want to use `--limit-output`/`-r` to + get output in a more machine parseable format. NOTE: Not all + commands handle return of information in an easily digestible output. - * Use exit codes to determine status. Chocolatey exits with 0 when - everything worked appropriately and other exits codes like 1 when - things error. There are package specific exit codes that are + * Use exit codes to determine status. Chocolatey exits with 0 when + everything worked appropriately and other exits codes like 1 when + things error. There are package specific exit codes that are recommended to be used and reboot indicating exit codes as well. To - check exit code when using PowerShell, immediately call + check exit code when using PowerShell, immediately call `$exitCode = $LASTEXITCODE` to get the value choco exited with. -Here's an example following bad practices (line breaks added for +Here's an example following bad practices (line breaks added for readability): - `choco install pkg1 -y -params '/Option:Value /Option2:value with + `choco install pkg1 -y -params '/Option:Value /Option2:value with spaces' --c4b-option 'Yaass' --option-that-is-new 'dude upgrade'` -Now here is that example written with best practices (again line - breaks added for readability - there are not line continuations +Now here is that example written with best practices (again line + breaks added for readability - there are not line continuations for choco): `choco upgrade pkg1 -y --source=""'https://chocolatey.org/api/v2'"" --package-parameters=""'/Option:Value /Option2:value with spaces'"" --c4b-option=""'Yaass'"" --option-that-is-new=""'dude upgrade'""` -Note the differences between the two: - * Which is more self-documenting? - * Which will allow for the newest version of something installed or +Note the differences between the two: + * Which is more self-documenting? + * Which will allow for the newest version of something installed or upgraded to (which allows for more environmental consistency on packages and versions)? * Which may throw an error on a badly passed option? - * Which will throw errors on unknown option values? See explanation + * Which will throw errors on unknown option values? See explanation below. Chocolatey ignores options it doesn't understand, but it can only @@ -594,8 +594,8 @@ equals sign ('='). Note those last two options in the examples above? If you roll off of a commercial edition or someone with older version attempts to run the badly crafted script `--c4b-option 'Yaass' --option-that-is-new 'dude upgrade'`, they are likely to see errors on - 'Yaass' and 'dude upgrade' because they are not explicitly tied to the - option they are written after. Now compare that to the other script. + 'Yaass' and 'dude upgrade' because they are not explicitly tied to the + option they are written after. Now compare that to the other script. Choco will ignore `--c4b-option=""'Yaass'""` and `--option-that-is-new=""'dude upgrade'""` as a whole when it doesn't register the options. This means that your script doesn't error. diff --git a/src/chocolatey/infrastructure.app/commands/ChocolateyApiKeyCommand.cs b/src/chocolatey/infrastructure.app/commands/ChocolateyApiKeyCommand.cs index 683038f285..8b6ba5f739 100644 --- a/src/chocolatey/infrastructure.app/commands/ChocolateyApiKeyCommand.cs +++ b/src/chocolatey/infrastructure.app/commands/ChocolateyApiKeyCommand.cs @@ -1,13 +1,13 @@ // Copyright © 2017 - 2018 Chocolatey Software, Inc // Copyright © 2011 - 2017 RealDimensions Software, LLC -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. -// +// // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -61,7 +61,7 @@ public virtual void handle_additional_argument_parsing(IList unparsedArg public virtual void handle_validation(ChocolateyConfiguration configuration) { - if (!configuration.ApiKeyCommand.Remove && !string.IsNullOrWhiteSpace(configuration.ApiKeyCommand.Key) + if (!configuration.ApiKeyCommand.Remove && !string.IsNullOrWhiteSpace(configuration.ApiKeyCommand.Key) && string.IsNullOrWhiteSpace(configuration.Sources)) { throw new ApplicationException("You must specify both 'source' and 'key' to set an API key."); @@ -69,7 +69,7 @@ public virtual void handle_validation(ChocolateyConfiguration configuration) if (configuration.ApiKeyCommand.Remove && string.IsNullOrWhiteSpace(configuration.Sources)) { throw new ApplicationException("You must specify 'source' to remove an API key."); - + } } @@ -77,7 +77,7 @@ public virtual void help_message(ChocolateyConfiguration configuration) { this.Log().Info(ChocolateyLoggers.Important, "ApiKey Command"); this.Log().Info(@" -This lists api keys that are set or sets an api key for a particular +This lists api keys that are set or sets an api key for a particular source so it doesn't need to be specified every time. Anything that doesn't contain source and key will list api keys. @@ -97,30 +97,30 @@ choco apikey choco apikey -s ""https://push.chocolatey.org/"" -k=""123-123123-123"" choco apikey -s ""http://internal_nexus"" -k=""user:password"" -For source location, this can be a folder/file share or an -http location. When it comes to urls, they can be different from the packages -url (where packages are searched and installed from). As an example, for -Chocolatey's community package package repository, the package url is https://chocolatey.org/api/v2, but the push url is https://push.chocolatey.org -(and the deprecated https://chocolatey.org/ as a push url). Check the -documentation for your choice of repository to learn what the push url is. - -For the key, this can be an apikey that is provided by your source repository. -With some sources, like Nexus, this can be a NuGet API key or it could be a -user name and password specified as 'user:password' for the API key. Please see -your repository's documentation (for Nexus, please see +For source location, this can be a folder/file share or an +http location. When it comes to urls, they can be different from the packages +url (where packages are searched and installed from). As an example, for +Chocolatey's community package package repository, the package url is +(and the deprecated https://chocolatey.org/ as a push url). Check the +documentation for your choice of repository to learn what the push url is. + +For the key, this can be an apikey that is provided by your source repository. +With some sources, like Nexus, this can be a NuGet API key or it could be a +user name and password specified as 'user:password' for the API key. Please see +your repository's documentation (for Nexus, please see https://bit.ly/nexus2apikey). -NOTE: See scripting in the command reference (`choco -?`) for how to +NOTE: See scripting in the command reference (`choco -?`) for how to write proper scripts and integrations. "); "chocolatey".Log().Info(ChocolateyLoggers.Important, "Connecting to Chocolatey.org (Community Package Repository)"); "chocolatey".Log().Info(() => @" -In order to save your API key for {0}, +In order to save your API key for {0}, log in (or register, confirm and then log in) to - {0}, go to {0}account, + {0}, go to {0}account, copy the API Key, and then use it in the following command: choco apikey -k -s {0} @@ -135,8 +135,8 @@ Exit codes that normally result from running this command. - 0: operation was successful, no issues detected - -1 or 1: an error has occurred -If you find other exit codes that we have not yet documented, please - file a ticket so we can document it at +If you find other exit codes that we have not yet documented, please + file a ticket so we can document it at https://github.com/chocolatey/choco/issues/new/choose. "); diff --git a/src/chocolatey/infrastructure.app/commands/ChocolateySourceCommand.cs b/src/chocolatey/infrastructure.app/commands/ChocolateySourceCommand.cs index 25d5caf991..f396367d4f 100644 --- a/src/chocolatey/infrastructure.app/commands/ChocolateySourceCommand.cs +++ b/src/chocolatey/infrastructure.app/commands/ChocolateySourceCommand.cs @@ -1,13 +1,13 @@ // Copyright © 2017 - 2018 Chocolatey Software, Inc // Copyright © 2011 - 2017 RealDimensions Software, LLC -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. -// +// // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -64,13 +64,13 @@ public virtual void configure_argument_parser(OptionSet optionSet, ChocolateyCon option => configuration.SourceCommand.CertificatePassword = option.remove_surrounding_quotes()) .Add("priority=", "Priority - The priority order of this source as compared to other sources, lower is better. Defaults to 0 (no priority). All priorities above 0 will be evaluated first, then zero-based values will be evaluated in config file order. Available in 0.9.9.9+.", - option => configuration.SourceCommand.Priority = int.Parse(option.remove_surrounding_quotes())) + option => configuration.SourceCommand.Priority = int.Parse(option.remove_surrounding_quotes())) .Add("bypassproxy|bypass-proxy", "Bypass Proxy - Should this source explicitly bypass any explicitly or system configured proxies? Defaults to false. Available in 0.10.4+.", option => configuration.SourceCommand.BypassProxy = option != null) .Add("allowselfservice|allow-self-service", "Allow Self-Service - Should this source be allowed to be used with self-service? Requires business edition (v1.10.0+) with feature 'useBackgroundServiceWithSelfServiceSourcesOnly' turned on. Defaults to false. Available in 0.10.4+.", - option => configuration.SourceCommand.AllowSelfService = option != null) + option => configuration.SourceCommand.AllowSelfService = option != null) .Add("adminonly|admin-only", "Visible to Administrators Only - Should this source be visible to non-administrators? Requires business edition (v1.12.2+). Defaults to false. Available in 0.10.8+.", option => configuration.SourceCommand.VisibleToAdminsOnly = option != null) @@ -104,7 +104,7 @@ public virtual void handle_validation(ChocolateyConfiguration configuration) { throw new ApplicationException("When specifying the subcommand '{0}', you must also specify --name.".format_with(configuration.SourceCommand.Command.to_string())); } - + if (configuration.SourceCommand.Command == SourceCommandType.add && string.IsNullOrWhiteSpace(configuration.Sources)) { throw new ApplicationException("When specifying the subcommand 'add', you must also specify --source.".format_with(configuration.SourceCommand.Command.to_string())); @@ -149,11 +149,11 @@ choco source list choco source remove -n=bob When it comes to the source location, this can be a folder/file share or an http -location. If it is a url, it will be a location you can go to in a browser and -it returns OData with something that says Packages in the browser, similar to what you see when you go to https://chocolatey.org/api/v2/. +location. If it is a url, it will be a location you can go to in a browser and +it returns OData with something that says Packages in the browser, similar to -NOTE: See scripting in the command reference (`choco -?`) for how to +NOTE: See scripting in the command reference (`choco -?`) for how to write proper scripts and integrations. "); @@ -166,8 +166,8 @@ Exit codes that normally result from running this command. - 0: operation was successful, no issues detected - -1 or 1: an error has occurred -If you find other exit codes that we have not yet documented, please - file a ticket so we can document it at +If you find other exit codes that we have not yet documented, please + file a ticket so we can document it at https://github.com/chocolatey/choco/issues/new/choose. "); From 44c9e1d26960f2a5c9985db2ff43075dc3f19c02 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Thu, 15 Apr 2021 09:18:08 +0100 Subject: [PATCH 16/19] (#2231) Change default repository URL As part of the community changes for our web infrastructure, the default repository URL is now community.chocolatey.org/api/v2/ rather than chocolatey.org/api/v2/, so all places where the old URL is used has been updated. There are redirects in place for this, but it makes sense for the source to updated to reflect the actual URL. --- src/chocolatey/infrastructure.app/ApplicationParameters.cs | 2 +- .../infrastructure.app/builders/ConfigurationBuilder.cs | 4 ++-- .../infrastructure.app/commands/ChocolateyApiKeyCommand.cs | 2 +- .../infrastructure.app/commands/ChocolateySourceCommand.cs | 4 ++-- .../infrastructure.app/configuration/chocolatey.config | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/chocolatey/infrastructure.app/ApplicationParameters.cs b/src/chocolatey/infrastructure.app/ApplicationParameters.cs index 8a39f7606a..1385dc9924 100644 --- a/src/chocolatey/infrastructure.app/ApplicationParameters.cs +++ b/src/chocolatey/infrastructure.app/ApplicationParameters.cs @@ -89,7 +89,7 @@ public static class ApplicationParameters public static readonly string TemplatesLocation = _fileSystem.combine_paths(InstallLocation, "templates"); public static readonly string ChocolateyCommunityFeedPushSourceOld = "https://chocolatey.org/"; public static readonly string ChocolateyCommunityFeedPushSource = "https://push.chocolatey.org/"; - public static readonly string ChocolateyCommunityFeedSource = "https://chocolatey.org/api/v2/"; + public static readonly string ChocolateyCommunityFeedSource = "https://community.chocolatey.org/api/v2/"; public static readonly string ChocolateyLicensedFeedSource = "https://licensedpackages.chocolatey.org/api/v2/"; public static readonly string ChocolateyLicensedFeedSourceName = "chocolatey.licensed"; public static readonly string UserAgent = "Chocolatey Command Line"; diff --git a/src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs b/src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs index 6dbe098c6a..2f30fda2fa 100644 --- a/src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs +++ b/src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs @@ -550,9 +550,9 @@ continue without requiring any action after the temporary timeout * Prefer upgrade to install in scripts. You can't `install` to a newer version of something, but you can `choco upgrade` which will do both upgrade or install (unless switched off explicitly). - not source name ('https://chocolatey.org/api/v2' versus * If you are sharing the script with others, pass `--source` to be explicit about where the package is coming from. Use full link and + not source name ('https://community.chocolatey.org/api/v2/' versus 'chocolatey'). * If parsing output, you might want to use `--limit-output`/`-r` to get output in a more machine parseable format. NOTE: Not all @@ -575,7 +575,7 @@ Now here is that example written with best practices (again line breaks added for readability - there are not line continuations for choco): - `choco upgrade pkg1 -y --source=""'https://chocolatey.org/api/v2'"" + `choco upgrade pkg1 -y --source=""'https://community.chocolatey.org/api/v2/'"" --package-parameters=""'/Option:Value /Option2:value with spaces'"" --c4b-option=""'Yaass'"" --option-that-is-new=""'dude upgrade'""` diff --git a/src/chocolatey/infrastructure.app/commands/ChocolateyApiKeyCommand.cs b/src/chocolatey/infrastructure.app/commands/ChocolateyApiKeyCommand.cs index 8b6ba5f739..35de7c2c15 100644 --- a/src/chocolatey/infrastructure.app/commands/ChocolateyApiKeyCommand.cs +++ b/src/chocolatey/infrastructure.app/commands/ChocolateyApiKeyCommand.cs @@ -97,11 +97,11 @@ choco apikey choco apikey -s ""https://push.chocolatey.org/"" -k=""123-123123-123"" choco apikey -s ""http://internal_nexus"" -k=""user:password"" -https://chocolatey.org/api/v2, but the push url is https://push.chocolatey.org For source location, this can be a folder/file share or an http location. When it comes to urls, they can be different from the packages url (where packages are searched and installed from). As an example, for Chocolatey's community package package repository, the package url is +https://community.chocolatey.org/api/v2/, but the push url is https://push.chocolatey.org (and the deprecated https://chocolatey.org/ as a push url). Check the documentation for your choice of repository to learn what the push url is. diff --git a/src/chocolatey/infrastructure.app/commands/ChocolateySourceCommand.cs b/src/chocolatey/infrastructure.app/commands/ChocolateySourceCommand.cs index f396367d4f..5bf439a804 100644 --- a/src/chocolatey/infrastructure.app/commands/ChocolateySourceCommand.cs +++ b/src/chocolatey/infrastructure.app/commands/ChocolateySourceCommand.cs @@ -48,7 +48,7 @@ public virtual void configure_argument_parser(OptionSet optionSet, ChocolateyCon "Name - the name of the source. Required with actions other than list. Defaults to empty.", option => configuration.SourceCommand.Name = option.remove_surrounding_quotes()) .Add("s=|source=", - "Source - The source. This can be a folder/file share or an http location. If it is a url, it will be a location you can go to in a browser and it returns OData with something that says Packages in the browser, similar to what you see when you go to https://chocolatey.org/api/v2/. Required with add action. Defaults to empty.", + "Source - The source. This can be a folder/file share or an http location. If it is a url, it will be a location you can go to in a browser and it returns OData with something that says Packages in the browser, similar to what you see when you go to https://community.chocolatey.org/api/v2/. Required with add action. Defaults to empty.", option => configuration.Sources = option.remove_surrounding_quotes()) .Add("u=|user=", "User - used with authenticated feeds. Defaults to empty.", @@ -149,9 +149,9 @@ choco source list choco source remove -n=bob When it comes to the source location, this can be a folder/file share or an http -what you see when you go to https://chocolatey.org/api/v2/. location. If it is a url, it will be a location you can go to in a browser and it returns OData with something that says Packages in the browser, similar to +what you see when you go to https://community.chocolatey.org/api/v2/. NOTE: See scripting in the command reference (`choco -?`) for how to write proper scripts and integrations. diff --git a/src/chocolatey/infrastructure.app/configuration/chocolatey.config b/src/chocolatey/infrastructure.app/configuration/chocolatey.config index 2a4275993d..216f20b480 100644 --- a/src/chocolatey/infrastructure.app/configuration/chocolatey.config +++ b/src/chocolatey/infrastructure.app/configuration/chocolatey.config @@ -9,7 +9,7 @@ - + From 32461370879f26c1595083aeed8b49c73f6aaeb5 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Thu, 15 Apr 2021 09:47:52 +0100 Subject: [PATCH 17/19] (maint) Remove unnecessary whitespace --- .../helpers/functions/Get-CheckSumValid.ps1 | 2 +- .../Install-ChocolateyVsixPackage.ps1 | 22 +++++++++---------- .../Install-ChocolateyZipPackage.ps1 | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/chocolatey.resources/helpers/functions/Get-CheckSumValid.ps1 b/src/chocolatey.resources/helpers/functions/Get-CheckSumValid.ps1 index e01a253924..670ea2da60 100644 --- a/src/chocolatey.resources/helpers/functions/Get-CheckSumValid.ps1 +++ b/src/chocolatey.resources/helpers/functions/Get-CheckSumValid.ps1 @@ -146,7 +146,7 @@ param( Write-Warning "Missing package checksums are not allowed (by default for HTTP/FTP, `n HTTPS when feature 'allowEmptyChecksumsSecure' is disabled) for `n safety and security reasons. Although we strongly advise against it, `n if you need this functionality, please set the feature `n 'allowEmptyChecksums' ('choco feature enable -n `n allowEmptyChecksums') `n or pass in the option '--allow-empty-checksums'. You can also pass `n checksums at runtime (recommended). See `choco install -?` for details." Write-Debug "If you are a maintainer attempting to determine the checksum for packaging purposes, please run `n 'choco install checksum' and run 'checksum -t sha256 -f $file' `n Ensure you do this for all remote resources." - if ($PSVersionTable.PSVersion.Major -ge 4){ + if ($PSVersionTable.PSVersion.Major -ge 4){ Write-Debug "Because you are running Powershell with a major version of v4 or greater, you could also opt to run `n '(Get-FileHash -Path $file -Algorithm SHA256).Hash' `n rather than install a separate tool." } diff --git a/src/chocolatey.resources/helpers/functions/Install-ChocolateyVsixPackage.ps1 b/src/chocolatey.resources/helpers/functions/Install-ChocolateyVsixPackage.ps1 index a5b8e7f3a0..a386f19335 100644 --- a/src/chocolatey.resources/helpers/functions/Install-ChocolateyVsixPackage.ps1 +++ b/src/chocolatey.resources/helpers/functions/Install-ChocolateyVsixPackage.ps1 @@ -66,26 +66,26 @@ by looking at the folders under Program Files / Program Files (x86). In 0.10.4+, `VisualStudioVersion` is an alias for VsVersion. .PARAMETER Checksum -The checksum hash value of the Url resource. This allows a checksum to +The checksum hash value of the Url resource. This allows a checksum to be validated for files that are not local. The checksum type is covered -by ChecksumType. +by ChecksumType. -**NOTE:** Checksums in packages are meant as a measure to validate the +**NOTE:** Checksums in packages are meant as a measure to validate the originally intended file that was used in the creation of a package is the same file that is received at a future date. Since this is used for -other steps in the process related to the community repository, it +other steps in the process related to the community repository, it ensures that the file a user receives is the same file a maintainer -and a moderator (if applicable), plus any moderation review has -intended for you to receive with this package. If you are looking at a -remote source that uses the same url for updates, you will need to -ensure the package also stays updated in line with those remote resource updates. You should look into [automatic packaging](https://docs.chocolatey.org/en-us/create/automatic-packages) +and a moderator (if applicable), plus any moderation review has +intended for you to receive with this package. If you are looking at a +remote source that uses the same url for updates, you will need to +ensure the package also stays updated in line with those remote to help provide that functionality. -**NOTE:** To determine checksums, you can get that from the original -site if provided. You can also use the [checksum tool available on the community feed](https://chocolatey.org/packages/checksum) (`choco install checksum`) -and use it e.g. `checksum -t sha256 -f path\to\file`. Ensure you +**NOTE:** To determine checksums, you can get that from the original +site if provided. You can also use the [checksum tool available on +and use it e.g. `checksum -t sha256 -f path\to\file`. Ensure you provide checksums for all remote resources used. .PARAMETER ChecksumType diff --git a/src/chocolatey.resources/helpers/functions/Install-ChocolateyZipPackage.ps1 b/src/chocolatey.resources/helpers/functions/Install-ChocolateyZipPackage.ps1 index 622328c110..98cf9b9b8b 100644 --- a/src/chocolatey.resources/helpers/functions/Install-ChocolateyZipPackage.ps1 +++ b/src/chocolatey.resources/helpers/functions/Install-ChocolateyZipPackage.ps1 @@ -203,7 +203,7 @@ param( if ($url -eq '' -or $url -eq $null) { $url = $file - } + } if ($url64bit -eq '' -or $url64bit -eq $null) { $url64bit = $file64 } From 0b09bd388934f74318a09871fdd448ef45056bb5 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Thu, 15 Apr 2021 09:52:43 +0100 Subject: [PATCH 18/19] (#2205) Update remaining URLs to new location Additional URL's, for example, those pointing at chocolatey.org/blog, as well as those pointing at chocolatey.org/packages, have now been updated to point at the correct URLs. --- .github/ISSUE_TEMPLATE.md | 2 +- .github/ISSUE_TEMPLATE/ReportPackageIssue.md | 2 +- .github/ISSUE_TEMPLATE/ReportWebsiteIssue.md | 4 ++-- .github/SECURITY.md | 4 ++-- CHANGELOG.md | 2 +- CHANGELOG_LICENSED.md | 2 +- CONTRIBUTING.md | 2 +- GenerateDocs.ps1 | 14 +++++++------- README.md | 10 +++++----- nuget/chocolatey.lib/chocolatey.lib.nuspec | 4 ++-- nuget/chocolatey/chocolatey.nuspec | 4 ++-- setup.ps1 | 2 +- .../helpers/functions/Get-CheckSumValid.ps1 | 4 ++-- .../helpers/functions/Get-ChocolateyWebFile.ps1 | 2 +- .../helpers/functions/Get-PackageParameters.ps1 | 2 +- .../functions/Install-ChocolateyPackage.ps1 | 2 +- .../Install-ChocolateyPowershellCommand.ps1 | 2 +- .../functions/Install-ChocolateyVsixPackage.ps1 | 4 ++-- .../functions/Install-ChocolateyZipPackage.ps1 | 2 +- .../commands/ChocolateyInstallCommand.cs | 2 +- .../infrastructure.app/runners/GenericRunner.cs | 3 ++- .../templates/ChocolateyInstallTemplate.cs | 2 +- .../templates/ChocolateyReadMeTemplate.cs | 2 +- .../templates/ChocolateyTodoTemplate.cs | 2 +- .../templates/ChocolateyUninstallTemplate.cs | 2 +- .../infrastructure.app/templates/NuspecTemplate.cs | 4 ++-- 26 files changed, 44 insertions(+), 43 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index fce17313d4..2bfa507794 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -2,7 +2,7 @@ REPORTING A SECURITY FINDING? Stop, this is not the correct place to provide a security disclosure. -Please go to https://chocolatey.org/security for the proper disclosure process. +Please go to https://docs.chocolatey.org/en-us/information/security for the proper disclosure process. BEFORE YOU SUBMIT AN ISSUE: diff --git a/.github/ISSUE_TEMPLATE/ReportPackageIssue.md b/.github/ISSUE_TEMPLATE/ReportPackageIssue.md index 28a14179d8..ddf94ac11e 100644 --- a/.github/ISSUE_TEMPLATE/ReportPackageIssue.md +++ b/.github/ISSUE_TEMPLATE/ReportPackageIssue.md @@ -12,7 +12,7 @@ This is the repository for choco.exe, the command line interface for Chocolatey, For all things packages, you have two routes: 1. If you are having issue with a package or you want to see an enhancement, please see https://docs.chocolatey.org/en-us/community-repository/users/package-triage-process (Package Triage Process / Becoming a maintainer of existing packages). -2. If you are looking for packages to be added to the community package repository (aka https://chocolatey.org/packages), please see https://docs.chocolatey.org/en-us/community-repository/users/package-triage-process#package-request-package-missing (Package Requests). +2. If you are looking for packages to be added to the community package repository (aka https://community.chocolatey.org/packages), please see https://docs.chocolatey.org/en-us/community-repository/users/package-triage-process#package-request-package-missing (Package Requests). diff --git a/.github/ISSUE_TEMPLATE/ReportWebsiteIssue.md b/.github/ISSUE_TEMPLATE/ReportWebsiteIssue.md index f9927c6e99..fa551b2019 100644 --- a/.github/ISSUE_TEMPLATE/ReportWebsiteIssue.md +++ b/.github/ISSUE_TEMPLATE/ReportWebsiteIssue.md @@ -1,13 +1,13 @@ --- name: Website - Report Issue / Suggest Feature -about: Something weird about https://chocolatey.org or do you want to suggest a feature? +about: Something weird about https://community.chocolatey.org or do you want to suggest a feature? --- STOP RIGHT HERE - DO NOT CREATE A TICKET FOR THE WEBSITE ON THIS REPOSITORY This is the repository for choco.exe, the command line interface for Chocolatey, and issues/feature suggestions should be limited to only choco. -For Chocolatey Gallery aka Chocolatey Community Package Repository, you will need to head over to https://github.com/chocolatey/chocolatey.org and file a ticket there. +For Chocolatey Gallery aka Chocolatey Community Package Repository, you will need to head over to https://github.com/chocolatey/home and file a ticket there. diff --git a/.github/SECURITY.md b/.github/SECURITY.md index fc8bb5354b..43998ec9bb 100644 --- a/.github/SECURITY.md +++ b/.github/SECURITY.md @@ -2,5 +2,5 @@ Security reports should never start out in the open. Please follow up directly with the team if you have a contact. If not you can always start with the -information at https://chocolatey.org/security to see instructions on how to -provide the disclosure. Thank you! +information at https://docs.chocolatey.org/en-us/information/security to see +instructions on how to provide the disclosure. Thank you! diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c7bb16065..0d8c4c7202 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -463,7 +463,7 @@ What was planned for 0.9.10.4 is now 0.10.0. This is due partly to a breaking ch ### BREAKING CHANGES * [Security] Checksum requirement and enhancements - see [#112](https://github.com/chocolatey/choco/issues/112) -Checksums in package scripts are meant as a measure to validate the originally intended downloaded resources used in the creation of a package are the same files that are received at a future date. This also ensures that the same files that are checked by all parts of moderation (if applicable) are the same files that are received by users for a package. This is seen mostly on the community repository because it is public and packages are subject to copyright laws (distribution rights), which typically requires the package scripts to download software from the official distribution locations. The Chocolatey framework has had the ability to use checksums in package scripts since [July 2014](https://chocolatey.org/packages/chocolatey/0.9.8.24#releasenotes). +Checksums in package scripts are meant as a measure to validate the originally intended downloaded resources used in the creation of a package are the same files that are received at a future date. This also ensures that the same files that are checked by all parts of moderation (if applicable) are the same files that are received by users for a package. This is seen mostly on the community repository because it is public and packages are subject to copyright laws (distribution rights), which typically requires the package scripts to download software from the official distribution locations. The Chocolatey framework has had the ability to use checksums in package scripts since [July 2014](https://community.chocolatey.org/packages/chocolatey/0.9.8.24#releasenotes). **What is the requirement?** choco will now fail if a package download resources from HTTP/FTP and does not use checksums to verify those downloaded resources. The requirement for HTTP/FTP is [#112](https://github.com/chocolatey/choco/issues/112). We are considering also requiring it for [HTTPS (#895)](https://github.com/chocolatey/choco/issues/895) as well. You can optionally set a feature (`allowEmptyChecksumsSecure`) to ensure packages using HTTPS also use checksums. diff --git a/CHANGELOG_LICENSED.md b/CHANGELOG_LICENSED.md index a90128d217..7354b9c3e4 100644 --- a/CHANGELOG_LICENSED.md +++ b/CHANGELOG_LICENSED.md @@ -513,7 +513,7 @@ Uninstall-ChocolateyWindowsService -Name 'chocolatey-agent' ## 1.8.0 (November 16, 2016) -Package Builder has some major improvements in this release, including a new UI! See https://chocolatey.org/blog/package-builder-announcements for details! While building some of the features for the enhancements for this release, we've made quite a few tweaks and fixes to Package Builder and we think you are going to like the results. Being able to generate packages from the installed software on a reference system is huge (`choco new --from-programs-and-features`)! +Package Builder has some major improvements in this release, including a new UI! See https://blog.chocolatey.org/2016/11/package-builder-announcements/ for details! While building some of the features for the enhancements for this release, we've made quite a few tweaks and fixes to Package Builder and we think you are going to like the results. Being able to generate packages from the installed software on a reference system is huge (`choco new --from-programs-and-features`)! Pro users now have the ability to download packages (minus internalization). This is fantastic if you want to pull down a lot of packages quickly from a remote source. Or pull down packages and push them up to an internal source. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 39adf43b01..721513a3c2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -48,7 +48,7 @@ Do not submit issues for missing `SolutionVersion.cs`. Please see [Compiling / B Please see [Request Package Fixes or Updates / Become a maintainer of an existing package](https://docs.chocolatey.org/en-us/community-repository/users/package-triage-process). ### Package Request? Package Missing? -If you are looking for packages to be added to the community feed (aka https://chocolatey.org/packages), please see [Package Requests](https://docs.chocolatey.org/en-us/community-repository/users/package-triage-process#package-request-package-missing). +If you are looking for packages to be added to the community feed (aka https://community.chocolatey.org/packages), please see [Package Requests](https://docs.chocolatey.org/en-us/community-repository/users/package-triage-process#package-request-package-missing). ### Submitting an Enhancement / Feature Request? If this is for choco (the CLI tool), this is the right place. See below. Otherwise see [Submitting Issues](https://github.com/chocolatey/choco#submitting-issues) for enhancements to the website, enhancements to the ChocolateyGUI, etc. diff --git a/GenerateDocs.ps1 b/GenerateDocs.ps1 index e5edf426d2..0be09afc32 100644 --- a/GenerateDocs.ps1 +++ b/GenerateDocs.ps1 @@ -130,16 +130,16 @@ function Replace-CommonItems($text) { $text = $text.Replace("`n",$lineFeed) $text = $text -replace "\*\*NOTE:\*\*", "> :memo: **NOTE**" - $text = $text -replace '(community feed[s]?[^\]]|community repository)', '[$1](https://chocolatey.org/packages)' + $text = $text -replace '(community feed[s]?[^\]]|community repository)', '[$1](https://community.chocolatey.org/packages)' $text = $text -replace '(Chocolatey for Business|Chocolatey Professional|Chocolatey Pro)(?=[^\w])', '[$1](https://chocolatey.org/compare)' $text = $text -replace '(Pro[fessional]\s?/\s?Business)', '[$1](https://chocolatey.org/compare)' $text = $text -replace '([Ll]icensed editions)', '[$1](https://chocolatey.org/compare)' $text = $text -replace '([Ll]icensed versions)', '[$1](https://chocolatey.org/compare)' $text = $text -replace '\(https://docs.chocolatey.org/en-us/create/automatic-packages\)', '(xref:automatic-packaging)' - $text = $text -replace 'Learn more about using this at https://chocolatey.org/docs/how-to-parse-package-parameters-argument', '[Learn more](xref:parse-package-parameters)' - $text = $text -replace 'at https://chocolatey.org/docs/how-to-parse-package-parameters-argument#step-3---use-core-community-extension', 'in [the docs](xref:parse-package-parameters#step-3-use-core-community-extension)' - $text = $text -replace 'https://chocolatey.org/docs/how-to-parse-package-parameters-argument', 'https://docs.chocolatey.org/en-us/guides/create/parse-packageparameters-argument' - $text = $text -replace '\[community feed\)\]\(https://chocolatey.org/packages\)', '[community feed](https://chocolatey.org/packages))' + $text = $text -replace 'Learn more about using this at https://docs.chocolatey.org/en-us/guides/create/parse-packageparameters-argument', '[Learn more](xref:parse-package-parameters)' + $text = $text -replace 'at https://docs.chocolatey.org/en-us/guides/create/parse-packageparameters-argument#step-3---use-core-community-extension', 'in [the docs](xref:parse-package-parameters#step-3-use-core-community-extension)' + $text = $text -replace 'https://docs.chocolatey.org/en-us/guides/create/parse-packageparameters-argument', 'https://docs.chocolatey.org/en-us/guides/create/parse-packageparameters-argument' + $text = $text -replace '\[community feed\)\]\(https://community.chocolatey.org/packages\)', '[community feed](https://community.chocolatey.org/packages))' Write-Output $text } @@ -222,7 +222,7 @@ param( $commandText = $commandText -replace 'NOTE\:', '> :memo: **NOTE**' $commandText = $commandText -replace '\*> :memo: \*\*NOTE\*\*\*', '> :memo: **NOTE**' $commandText = $commandText -replace 'the command reference', '[how to pass arguments](xref:choco-commands#how-to-pass-options-switches)' - $commandText = $commandText -replace '(community feed[s]?|community repository)', '[$1](https://chocolatey.org/packages)' + $commandText = $commandText -replace '(community feed[s]?|community repository)', '[$1](https://comminty.chocolatey.org/packages)' #$commandText = $commandText -replace '\`(apikey|install|upgrade|uninstall|list|search|info|outdated|pin)\`', '[[`$1`|Commands$1]]' $commandText = $commandText -replace '\`([choco\s]*)(apikey|install|upgrade|uninstall|list|search|info|outdated|pin)\`', '[`$1$2`](xref:choco-command-$2)' $commandText = $commandText -replace '^(.+):\s(.+.gif)$', '![$1]($2)' @@ -245,7 +245,7 @@ param( $commandText = $commandText -replace 'y.org/docs/features-package-reducer', 'y.org/docs/en-us/features/package-reducer' $commandText = $commandText -replace 'https://chocolatey.org/docs/features-package-reducer', 'https://docs.chocolatey.org/en-us/features/package-reducer' $commandText = $commandText -replace 'https://chocolatey.org/docs/en-us/features/package-reducer', 'https://docs.chocolatey.org/en-us/features/package-reducer' - $commandText = $commandText -replace '\[community feed\)\]\(https://chocolatey.org/packages\)', '[community feed](https://chocolatey.org/packages))' + $commandText = $commandText -replace '\[community feed\)\]\(https://community.chocolatey.org/packages\)', '[community feed](https://community.chocolatey.org/packages))' $optionsSwitches = @' ## $1 diff --git a/README.md b/README.md index 7c4def00da..bc548d603e 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ You can just call me choco. ![Chocolatey Logo](https://cdn.rawgit.com/chocolatey/choco/14a627932c78c8baaba6bef5f749ebfa1957d28d/docs/logo/chocolateyicon.gif "Chocolatey") -[![](https://img.shields.io/chocolatey/dt/chocolatey.svg)](https://chocolatey.org/packages/chocolatey) [![](https://img.shields.io/chocolatey/v/chocolatey.svg)](https://chocolatey.org/packages/chocolatey) [![Project Stats](https://www.openhub.net/p/chocolatey/widgets/project_thin_badge.gif)](https://www.openhub.net/p/chocolatey) +[![](https://img.shields.io/chocolatey/dt/chocolatey.svg)](https://community.chocolatey.org/packages/chocolatey) [![](https://img.shields.io/chocolatey/v/chocolatey.svg)](https://community.chocolatey.org/packages/chocolatey) [![Project Stats](https://www.openhub.net/p/chocolatey/widgets/project_thin_badge.gif)](https://www.openhub.net/p/chocolatey) @@ -60,10 +60,10 @@ If you are an open source user requesting support, please remember that most fol If you are using a [commercial edition of Chocolatey](https://chocolatey.org/compare#compare), you have different terms! Please see [support](https://chocolatey.org/support). ## Information - * [Chocolatey Website and Community Package Repository](https://chocolatey.org) + * [Chocolatey Website and Community Package Repository](https://community.chocolatey.org) * [Mailing List](http://groups.google.com/group/chocolatey) / [Release Announcements Only Mailing List](https://groups.google.com/group/chocolatey-announce) / [Build Status Mailing List](http://groups.google.com/group/chocolatey-build-status) * [Twitter](https://twitter.com/chocolateynuget) / [Facebook](https://www.facebook.com/ChocolateySoftware) / [Github](https://github.com/chocolatey) - * [Blog](https://chocolatey.org/blog) / [Newsletter](https://chocolatey.us8.list-manage1.com/subscribe?u=86a6d80146a0da7f2223712e4&id=73b018498d) + * [Blog](https://blog.chocolatey.org/) / [Newsletter](https://chocolatey.us8.list-manage1.com/subscribe?u=86a6d80146a0da7f2223712e4&id=73b018498d) * [Documentation](https://docs.chocolatey.org/en-us/) / [Support](https://chocolatey.org/support) ### Documentation @@ -83,12 +83,12 @@ Apache 2.0 - see [LICENSE](https://github.com/chocolatey/choco/blob/master/LICEN ![submitting issues](https://cloud.githubusercontent.com/assets/63502/12534554/6ea7cc04-c224-11e5-82ad-3805d0b5c724.png) * If you are having issue with a package, please see [Request Package Fixes or Updates / Become a maintainer of an existing package](https://docs.chocolatey.org/en-us/community-repository/users/package-triage-process). - * If you are looking for packages to be added to the community feed (aka https://chocolatey.org/packages), please see [Package Requests](https://docs.chocolatey.org/en-us/community-repository/users/package-triage-process#package-request-package-missing). + * If you are looking for packages to be added to the community feed (aka https://community.chocolatey.org/packages), please see [Package Requests](https://docs.chocolatey.org/en-us/community-repository/users/package-triage-process#package-request-package-missing). 1. Start with [Troubleshooting](https://github.com/chocolatey/choco/wiki/Troubleshooting) and the [FAQ](https://github.com/chocolatey/choco/wiki/ChocolateyFAQs) to see if your question or issue already has an answer. 1. If not found or resolved, please follow one of the following avenues: * If you are a licensed customer, please see [support](https://chocolatey.org/support). You can also log an issue to [Licensed Issues](https://github.com/chocolatey/chocolatey-licensed-issues) and we will submit issues to all other places on your behalf. Another avenue is to use email support to have us submit tickets and other avenues on your behalf (allowing you to maintain privacy). - * If it is an enhancement request or issue with the website (the community package repository aka [https://chocolatey.org](https://chocolatey.org)), please submit the issue to the [Chocolatey.org repo](https://github.com/chocolatey/chocolatey.org). + * If it is an enhancement request or issue with the website (the community package repository aka [https://community.chocolatey.org](https://community.chocolatey.org)), please submit the issue to the [Chocolatey.org repo](https://github.com/chocolatey/home). * If you have found an issue with the GUI (Chocolatey GUI) or you want to submit an enhancement, please see [the ChocolateyGUI repository](https://github.com/chocolatey/ChocolateyGUI#submitting-issues). * If you have found an issue with the client (choco.exe), you are in the right place. Keep reading below. diff --git a/nuget/chocolatey.lib/chocolatey.lib.nuspec b/nuget/chocolatey.lib/chocolatey.lib.nuspec index 1613058210..9ccb45a197 100644 --- a/nuget/chocolatey.lib/chocolatey.lib.nuspec +++ b/nuget/chocolatey.lib/chocolatey.lib.nuspec @@ -24,10 +24,10 @@ This is the Chocolatey Library (API / DLL) package which allows Chocolatey to be ### Information - * [Chocolatey Website and Community Package Repository](https://chocolatey.org) + * [Chocolatey Website and Community Package Repository](https://community.chocolatey.org) * [Mailing List](http://groups.google.com/group/chocolatey) / [Release Announcements Only Mailing List](https://groups.google.com/group/chocolatey-announce) / [Build Status Mailing List](http://groups.google.com/group/chocolatey-build-status) * [Twitter](https://twitter.com/chocolateynuget) / [Facebook](https://www.facebook.com/ChocolateySoftware) / [Github](https://github.com/chocolatey) - * [Blog](https://chocolatey.org/blog) / [Newsletter](https://chocolatey.us8.list-manage1.com/subscribe?u=86a6d80146a0da7f2223712e4&id=73b018498d) + * [Blog](https://blog.chocolatey.org/) / [Newsletter](https://chocolatey.us8.list-manage1.com/subscribe?u=86a6d80146a0da7f2223712e4&id=73b018498d) * [Documentation](https://docs.chocolatey.org/en-us/) / [Support](https://chocolatey.org/support) diff --git a/nuget/chocolatey/chocolatey.nuspec b/nuget/chocolatey/chocolatey.nuspec index 7b922de08d..40f4d05805 100644 --- a/nuget/chocolatey/chocolatey.nuspec +++ b/nuget/chocolatey/chocolatey.nuspec @@ -27,10 +27,10 @@ You can host your own sources and add them to Chocolatey, you can extend Chocola ### Information - * [Chocolatey Website and Community Package Repository](https://chocolatey.org) + * [Chocolatey Website and Community Package Repository](https://community.chocolatey.org) * [Mailing List](http://groups.google.com/group/chocolatey) / [Release Announcements Only Mailing List](https://groups.google.com/group/chocolatey-announce) / [Build Status Mailing List](http://groups.google.com/group/chocolatey-build-status) * [Twitter](https://twitter.com/chocolateynuget) / [Facebook](https://www.facebook.com/ChocolateySoftware) / [Github](https://github.com/chocolatey) - * [Blog](https://chocolatey.org/blog) / [Newsletter](https://chocolatey.us8.list-manage1.com/subscribe?u=86a6d80146a0da7f2223712e4&id=73b018498d) + * [Blog](https://blog.chocolatey.org/) / [Newsletter](https://chocolatey.us8.list-manage1.com/subscribe?u=86a6d80146a0da7f2223712e4&id=73b018498d) * [Documentation](https://docs.chocolatey.org/en-us/) / [Support](https://chocolatey.org/support) ### Commands diff --git a/setup.ps1 b/setup.ps1 index 17b80ad72e..9ed7de8713 100644 --- a/setup.ps1 +++ b/setup.ps1 @@ -1,6 +1,6 @@ ### install chocolatey ### if(-not $env:ChocolateyInstall -or -not (Test-Path "$env:ChocolateyInstall")){ - iex ((new-object net.webclient).DownloadString("https://chocolatey.org/install.ps1")) + iex ((new-object net.webclient).DownloadString("https://community.chocolatey.org/install.ps1")) } cinst pester -version 2.0.2 diff --git a/src/chocolatey.resources/helpers/functions/Get-CheckSumValid.ps1 b/src/chocolatey.resources/helpers/functions/Get-CheckSumValid.ps1 index 670ea2da60..b64da7c06c 100644 --- a/src/chocolatey.resources/helpers/functions/Get-CheckSumValid.ps1 +++ b/src/chocolatey.resources/helpers/functions/Get-CheckSumValid.ps1 @@ -45,7 +45,7 @@ to what is expected. .NOTES This uses the checksum.exe tool available separately at -https://chocolatey.org/packages/checksum. +https://community.chocolatey.org/packages/checksum. Options that affect checksum verification: @@ -90,7 +90,7 @@ to help provide that functionality. **NOTE:** To determine checksums, you can get that from the original site if provided. You can also use the [checksum tool available on -the community feed](https://chocolatey.org/packages/checksum) (`choco install checksum`) +the community feed](https://community.chocolatey.org/packages/checksum) (`choco install checksum`) and use it e.g. `checksum -t sha256 -f path\to\file`. Ensure you provide checksums for all remote resources used. diff --git a/src/chocolatey.resources/helpers/functions/Get-ChocolateyWebFile.ps1 b/src/chocolatey.resources/helpers/functions/Get-ChocolateyWebFile.ps1 index b0361d1efe..3533e26ff1 100644 --- a/src/chocolatey.resources/helpers/functions/Get-ChocolateyWebFile.ps1 +++ b/src/chocolatey.resources/helpers/functions/Get-ChocolateyWebFile.ps1 @@ -108,7 +108,7 @@ to help provide that functionality. **NOTE:** To determine checksums, you can get that from the original site if provided. You can also use the [checksum tool available on -the community feed](https://chocolatey.org/packages/checksum) (`choco install checksum`) +the community feed](https://community.chocolatey.org/packages/checksum) (`choco install checksum`) and use it e.g. `checksum -t sha256 -f path\to\file`. Ensure you provide checksums for all remote resources used. diff --git a/src/chocolatey.resources/helpers/functions/Get-PackageParameters.ps1 b/src/chocolatey.resources/helpers/functions/Get-PackageParameters.ps1 index 9be76f22dc..f70fce0e81 100644 --- a/src/chocolatey.resources/helpers/functions/Get-PackageParameters.ps1 +++ b/src/chocolatey.resources/helpers/functions/Get-PackageParameters.ps1 @@ -40,7 +40,7 @@ Learn more about using this at https://docs.chocolatey.org/en-us/guides/create/p Available in 0.10.8+. If you need compatibility with older versions, take a dependency on the `chocolatey-core.extension` package which also provides this functionality. If you are pushing to the community -package repository (https://chocolatey.org/packages), you are required +package repository (https://community.chocolatey.org/packages), you are required to take a dependency on the core extension until January 2018. How to do this is explained at https://docs.chocolatey.org/en-us/guides/create/parse-packageparameters-argument#step-3---use-core-community-extension. diff --git a/src/chocolatey.resources/helpers/functions/Install-ChocolateyPackage.ps1 b/src/chocolatey.resources/helpers/functions/Install-ChocolateyPackage.ps1 index 1f274022fd..9131d0f2b3 100644 --- a/src/chocolatey.resources/helpers/functions/Install-ChocolateyPackage.ps1 +++ b/src/chocolatey.resources/helpers/functions/Install-ChocolateyPackage.ps1 @@ -148,7 +148,7 @@ to help provide that functionality. **NOTE:** To determine checksums, you can get that from the original site if provided. You can also use the [checksum tool available on -the community feed](https://chocolatey.org/packages/checksum) (`choco install checksum`) +the community feed](https://community.chocolatey.org/packages/checksum) (`choco install checksum`) and use it e.g. `checksum -t sha256 -f path\to\file`. Ensure you provide checksums for all remote resources used. diff --git a/src/chocolatey.resources/helpers/functions/Install-ChocolateyPowershellCommand.ps1 b/src/chocolatey.resources/helpers/functions/Install-ChocolateyPowershellCommand.ps1 index 04ad0c854f..5eddd3e0b2 100644 --- a/src/chocolatey.resources/helpers/functions/Install-ChocolateyPowershellCommand.ps1 +++ b/src/chocolatey.resources/helpers/functions/Install-ChocolateyPowershellCommand.ps1 @@ -118,7 +118,7 @@ to help provide that functionality. **NOTE:** To determine checksums, you can get that from the original site if provided. You can also use the [checksum tool available on -the community feed](https://chocolatey.org/packages/checksum) (`choco install checksum`) +the community feed](https://community.chocolatey.org/packages/checksum) (`choco install checksum`) and use it e.g. `checksum -t sha256 -f path\to\file`. Ensure you provide checksums for all remote resources used. diff --git a/src/chocolatey.resources/helpers/functions/Install-ChocolateyVsixPackage.ps1 b/src/chocolatey.resources/helpers/functions/Install-ChocolateyVsixPackage.ps1 index a386f19335..821d6bb704 100644 --- a/src/chocolatey.resources/helpers/functions/Install-ChocolateyVsixPackage.ps1 +++ b/src/chocolatey.resources/helpers/functions/Install-ChocolateyVsixPackage.ps1 @@ -75,16 +75,16 @@ originally intended file that was used in the creation of a package is the same file that is received at a future date. Since this is used for other steps in the process related to the community repository, it ensures that the file a user receives is the same file a maintainer -resource updates. You should look into [automatic packaging](https://docs.chocolatey.org/en-us/create/automatic-packages) and a moderator (if applicable), plus any moderation review has intended for you to receive with this package. If you are looking at a remote source that uses the same url for updates, you will need to ensure the package also stays updated in line with those remote +resource updates. You should look into [automatic packaging](https://docs.chocolatey.org/en-us/create/automatic-packages) to help provide that functionality. -the community feed](https://chocolatey.org/packages/checksum) (`choco install checksum`) **NOTE:** To determine checksums, you can get that from the original site if provided. You can also use the [checksum tool available on +the community feed](https://community.chocolatey.org/packages/checksum) (`choco install checksum`) and use it e.g. `checksum -t sha256 -f path\to\file`. Ensure you provide checksums for all remote resources used. diff --git a/src/chocolatey.resources/helpers/functions/Install-ChocolateyZipPackage.ps1 b/src/chocolatey.resources/helpers/functions/Install-ChocolateyZipPackage.ps1 index 98cf9b9b8b..8404fdd454 100644 --- a/src/chocolatey.resources/helpers/functions/Install-ChocolateyZipPackage.ps1 +++ b/src/chocolatey.resources/helpers/functions/Install-ChocolateyZipPackage.ps1 @@ -90,7 +90,7 @@ to help provide that functionality. **NOTE:** To determine checksums, you can get that from the original site if provided. You can also use the [checksum tool available on -the community feed](https://chocolatey.org/packages/checksum) (`choco install checksum`) +the community feed](https://community.chocolatey.org/packages/checksum) (`choco install checksum`) and use it e.g. `checksum -t sha256 -f path\to\file`. Ensure you provide checksums for all remote resources used. diff --git a/src/chocolatey/infrastructure.app/commands/ChocolateyInstallCommand.cs b/src/chocolatey/infrastructure.app/commands/ChocolateyInstallCommand.cs index e726e6e427..aba2c220f2 100644 --- a/src/chocolatey/infrastructure.app/commands/ChocolateyInstallCommand.cs +++ b/src/chocolatey/infrastructure.app/commands/ChocolateyInstallCommand.cs @@ -304,7 +304,7 @@ What is `-my`? See option bundling in the command reference option to not allow PATH changes. Until then you will need to manually go modify Path to just one Ruby and then use something like uru (https://bitbucket.org/jonforums/uru) or pik - (https://chocolatey.org/packages/pik) to switch between versions. + (https://community.chocolatey.org/packages/pik) to switch between versions. NOTE: See scripting in the command reference (`choco -?`) for how to write proper scripts and integrations. diff --git a/src/chocolatey/infrastructure.app/runners/GenericRunner.cs b/src/chocolatey/infrastructure.app/runners/GenericRunner.cs index 4d1b597515..5daaf667c6 100644 --- a/src/chocolatey/infrastructure.app/runners/GenericRunner.cs +++ b/src/chocolatey/infrastructure.app/runners/GenericRunner.cs @@ -306,7 +306,8 @@ require admin rights. Only advanced users should run choco w/out an attempting to use Chocolatey in a non-administrator setting, you must select a different location other than the default install location. See - https://chocolatey.org/install#non-administrative-install for details. + https://docs.chocolatey.org/en-us/choco/setup#non-administrative-install + for details. "); var selection = InteractivePrompt.prompt_for_confirmation(@" Do you want to continue?", new[] { "yes", "no" }, diff --git a/src/chocolatey/infrastructure.app/templates/ChocolateyInstallTemplate.cs b/src/chocolatey/infrastructure.app/templates/ChocolateyInstallTemplate.cs index 2ba9f24a19..139a105523 100644 --- a/src/chocolatey/infrastructure.app/templates/ChocolateyInstallTemplate.cs +++ b/src/chocolatey/infrastructure.app/templates/ChocolateyInstallTemplate.cs @@ -73,7 +73,7 @@ public class ChocolateyInstallTemplate #silentArgs = '-s' # Ghost # Note that some installers, in addition to the silentArgs above, may also need assistance of AHK to achieve silence. #silentArgs = '' # none; make silent with input macro script like AutoHotKey (AHK) - # https://chocolatey.org/packages/autohotkey.portable + # https://community.chocolatey.org/packages/autohotkey.portable #validExitCodes= @(0) #please insert other valid exit codes here } diff --git a/src/chocolatey/infrastructure.app/templates/ChocolateyReadMeTemplate.cs b/src/chocolatey/infrastructure.app/templates/ChocolateyReadMeTemplate.cs index 6e98320a4f..c401502584 100644 --- a/src/chocolatey/infrastructure.app/templates/ChocolateyReadMeTemplate.cs +++ b/src/chocolatey/infrastructure.app/templates/ChocolateyReadMeTemplate.cs @@ -22,7 +22,7 @@ public class ChocolateyReadMeTemplate @"## Summary How do I create packages? See https://docs.chocolatey.org/en-us/create/create-packages -If you are submitting packages to the community feed (https://chocolatey.org) +If you are submitting packages to the community feed (https://community.chocolatey.org) always try to ensure you have read, understood and adhere to the create packages wiki link above. diff --git a/src/chocolatey/infrastructure.app/templates/ChocolateyTodoTemplate.cs b/src/chocolatey/infrastructure.app/templates/ChocolateyTodoTemplate.cs index 735a621171..047e773c9e 100644 --- a/src/chocolatey/infrastructure.app/templates/ChocolateyTodoTemplate.cs +++ b/src/chocolatey/infrastructure.app/templates/ChocolateyTodoTemplate.cs @@ -128,7 +128,7 @@ anything you've needed from here PowerShell to do so or see if there is a function already defined: https://docs.chocolatey.org/en-us/create/functions - There may also be functions available in extension packages, see - https://chocolatey.org/packages?q=id%3A.extension for examples and + https://community.chocolatey.org/packages?q=id%3A.extension for examples and availability. - Clean out the comments and sections you are not using. diff --git a/src/chocolatey/infrastructure.app/templates/ChocolateyUninstallTemplate.cs b/src/chocolatey/infrastructure.app/templates/ChocolateyUninstallTemplate.cs index 764f91c499..d0ead8f27f 100644 --- a/src/chocolatey/infrastructure.app/templates/ChocolateyUninstallTemplate.cs +++ b/src/chocolatey/infrastructure.app/templates/ChocolateyUninstallTemplate.cs @@ -51,7 +51,7 @@ public class ChocolateyUninstallTemplate #silentArgs = '-s -u' # Ghost # Note that some installers, in addition to the silentArgs above, may also need assistance of AHK to achieve silence. #silentArgs = '' # none; make silent with input macro script like AutoHotKey (AHK) - # https://chocolatey.org/packages/autohotkey.portable + # https://community.chocolatey.org/packages/autohotkey.portable #validExitCodes= @(0) #please insert other valid exit codes here } diff --git a/src/chocolatey/infrastructure.app/templates/NuspecTemplate.cs b/src/chocolatey/infrastructure.app/templates/NuspecTemplate.cs index 9260c9f932..bc6637fa65 100644 --- a/src/chocolatey/infrastructure.app/templates/NuspecTemplate.cs +++ b/src/chocolatey/infrastructure.app/templates/NuspecTemplate.cs @@ -21,7 +21,7 @@ public class NuspecTemplate public static string Template = @" - + @@ -83,7 +83,7 @@ public class NuspecTemplate --> -