From fbde190d9147752ddef9c4dac10901fdcf4ab74d Mon Sep 17 00:00:00 2001 From: TheCakeIsNaOH Date: Wed, 10 Jan 2024 22:39:42 -0600 Subject: [PATCH] (#46) Remove Chocolatey Package Updater/ketarin references Also removes template/example packages from ketarin --- README.md | 45 +- automatic/1password/1password.nuspec | 68 - .../1password/tools/chocolateyinstall.ps1 | 17 - automatic/README.md | 17 +- automatic/_output/1password/1password.nuspec | 68 - .../1password/tools/chocolateyinstall.ps1 | 17 - automatic/_output/README.md | 7 - .../_output/git.install/git.install.nuspec | 78 - .../git.install/tools/chocolateyInstall.ps1 | 145 - automatic/git.install/git.install.nuspec | 78 - .../git.install/tools/chocolateyInstall.ps1 | 145 - ketarin/1password.ketarin.xml | 234 -- ketarin/README.md | 7 - ketarin/_KetarinChocolateyTemplate.xml | 108 - ketarin/git.install.ketarin.xml | 217 -- ops/README.md | 9 - ops/ketarinupdate.cmd | 29 - setup/KetarinSettings.xml | 2646 ----------------- setup/README.md | 15 +- setup/ketarin_setup.ps1 | 11 - 20 files changed, 4 insertions(+), 3957 deletions(-) delete mode 100644 automatic/1password/1password.nuspec delete mode 100644 automatic/1password/tools/chocolateyinstall.ps1 delete mode 100644 automatic/_output/1password/1password.nuspec delete mode 100644 automatic/_output/1password/tools/chocolateyinstall.ps1 delete mode 100644 automatic/_output/README.md delete mode 100644 automatic/_output/git.install/git.install.nuspec delete mode 100644 automatic/_output/git.install/tools/chocolateyInstall.ps1 delete mode 100644 automatic/git.install/git.install.nuspec delete mode 100644 automatic/git.install/tools/chocolateyInstall.ps1 delete mode 100644 ketarin/1password.ketarin.xml delete mode 100644 ketarin/README.md delete mode 100644 ketarin/_KetarinChocolateyTemplate.xml delete mode 100644 ketarin/git.install.ketarin.xml delete mode 100644 ops/README.md delete mode 100644 ops/ketarinupdate.cmd delete mode 100644 setup/KetarinSettings.xml delete mode 100644 setup/ketarin_setup.ps1 diff --git a/README.md b/README.md index f2ff195c9..0d99480ba 100644 --- a/README.md +++ b/README.md @@ -13,16 +13,11 @@ This contains Chocolatey packages, both manually and automatically maintained. -You can choose to use one or both of the different methods currently supported in the Chocolatey community for automatic packaging. They are AU (Automatic Updater) and Ketarin/ChocolateyPackageUpdater. - ### Folder Structure -* automatic - where automatic packaging and packages are kept. These are packages that are automatically maintained using either [AU](https://chocolatey.org/packages/au) or [Ketarin](https://chocolatey.org/packages/ketarin)/[ChocolateyPackageUpdater](https://chocolatey.org/packages/chocolateypackageupdater) combo. +* automatic - where automatic packaging and packages are kept. These are packages that are automatically maintained using [AU](https://chocolatey.org/packages/au). * icons - Where you keep icon files for the packages. This is done to reduce issues when packages themselves move around. -* ketarin - where ketarin jobs (aka applications or searches) exported as XML are kept. This is done to allow ease of contribution. * manual - where packages that are not automatic are kept. -* ops - scripts, jobs, and other items for ensuring automatic packaging. -* setup - items for prepping the system to ensure for auto packaging. For setting up your own automatic package repository, please see [Automatic Packaging](https://chocolatey.org/docs/automatic-packages) @@ -30,13 +25,6 @@ For setting up your own automatic package repository, please see [Automatic Pack * Chocolatey (choco.exe) -#### Ketarin / ChocolateyPackageUpdater - -* PowerShell v2+ -* [Ketarin](https://chocolatey.org/packages/ketarin) -* [Chocolatey Package Updater](https://chocolatey.org/packages/chocolateypackageupdater) -* A Windows box somewhere - to run the updater on - appveyor can't work until the import of the settings can be automated - #### AU * PowerShell v5+. @@ -48,16 +36,9 @@ For daily operations check out the AU packages [template README](https://github. 1. Fork this repository and rename it to `chocolatey-packages` (on GitHub - go into Settings, Repository name and rename). 1. Clone the repository locally. -1. Head into the `setup` folder and perform the proper steps for your choice of setup (or both if you plan to use both methods). +1. Head into the `setup` folder and perform the steps in the README there. 1. Edit this README. Update the badges at the top. - -### Recommendation on Auto Packaging - -AU provides more in the process of being completely automated, sending emails when things go wrong, and providing a nice report at the end. It doesn't have a bolt-on feeling to it that you see with Ketarin / ChocolateyPackageUdater, however the one thing it does lack in comparison is no visual feedback to seeing how searches for installers may be found. Other than that, it provides errors when things go wrong, where Ketarin doesn't consider anything that happens during "before run"/"post run updates" (where chocopkgup and checksumming occur) to be an error, even if those scripts error. - -So for best visibility, enjoying the ease of using AppVeyor, and for a nice report of results, we recommend AU over Ketarin. You also don't need to deal with templates as AU works directly with the xml/ps1 files to do replacement. - ### Adapting your current source repository to this source repository template You want to bring in all of your packages into the proper folders. We suggest using some sort of diffing tool to look at the differences between your current solution and this solution and then making adjustments to it. Pay special attention to the setup folder. @@ -65,31 +46,9 @@ You want to bring in all of your packages into the proper folders. We suggest us 1. Bring over the following files to your package source repository: * `automatic\README.md` * `icons\README.md` - * `ketarin\README.md` - * `ketarin\_KetarinChocolateyTemplate.xml` * `manual\README.md` - * `ops\*.*` * `setup\*.*` * `.appveyor.yml` 1. Inspect the following file and add the differences: * `.gitignore` -### Use Both Methodologies - -The way this source repository is designed, you can use both AU and Ketarin/ChocolateyPackageUpdater together. This is especially helpful when migrating existing packages from one methodology to the other. - -### Migrating existing Ketarin packages to AU - -1. Add an update.ps1 to the package folder and determine how to update the package using [AU's instructions](https://github.com/majkinetor/au#creating-the-package-updater-script). -1. Remove the ketarin.xml file from the ketarin folder. -1. Ensure you also remove the package job from Ketarin itself as it doesn't automatically remove. - -### Special Notes - -#### Ketarin - -* In `Settings -> Global variables` the variable `autoPackagesFolder` is used to determine where your automatic packages are. It doesn't matter what `chocopkgup` is using, this folder is passed through. Ensure this is set appropriately. -* In `Settings -> Global variables` the variable `saveDir` is used to determine where to save the downloaded files from Ketarin. Please ensure the folder exists. -* In `Settings -> Global variables` the variable `nopush` is set to `--nopush`, which allows checksum calculations to occur and then a custom script will push the files. -* In `Settings -> Global variables` the variable `cscript` is set to `2`, which means calculate checksums, rebuild, and push the packages. If you set this to `1` it will do everything except push the packages. Setting this to `1` is how you disable package pushing. -* In `Settings -> Global variables` the variable `checksum` is set to `{checksum}`. Do not change this, this is how the post update script replaces the literal value `{checksum}`. The same goes for `checksumx64`, `packageGuid`, and `url64`. diff --git a/automatic/1password/1password.nuspec b/automatic/1password/1password.nuspec deleted file mode 100644 index 41d192e9a..000000000 --- a/automatic/1password/1password.nuspec +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - 1password - - - - {{PackageVersion}} - https://github.com/ferventcoder/chocolatey-packages - - Rob Reynolds - - - - - 1Password (Install) - AgileBits - - https://1password.com/ - https://cdn.rawgit.com/ferventcoder/chocolatey-packages/02c21bebe5abb495a56747cbb9b4b5415c933fc0/icons/1password.png - AgileBits - - https://support.1password.com/legal/ - true - - - - 1password password keystore keys saver admin - 1Password - Have you ever forgotten a password? - 1Password – Too many passwords to remember? - -1Password can create strong, unique passwords for you, remember them, and restore them, all directly in your web browser. - - -**Please Note**: This is an automatically updated package. If you find it is -out of date by more than a day or two, please contact the maintainer(s) and -let them know the package is no longer updating correctly. - - - - - - - - - - diff --git a/automatic/1password/tools/chocolateyinstall.ps1 b/automatic/1password/tools/chocolateyinstall.ps1 deleted file mode 100644 index f018c1a21..000000000 --- a/automatic/1password/tools/chocolateyinstall.ps1 +++ /dev/null @@ -1,17 +0,0 @@ -$ErrorActionPreference = 'Stop'; -$packageName= '1password' # arbitrary name for the package, used in messages -$toolsDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)" - -$packageArgs = @{ - packageName = $packageName - unzipLocation = $toolsDir - fileType = 'exe' - url = '{{DownloadUrl}}' - softwareName = '1Password*' - checksum = '{{Checksum}}' - checksumType = 'sha256' - silentArgs = '/VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-' - validExitCodes= @(0) -} - -Install-ChocolateyPackage @packageArgs \ No newline at end of file diff --git a/automatic/README.md b/automatic/README.md index 0facd1c14..a181bda79 100644 --- a/automatic/README.md +++ b/automatic/README.md @@ -1,21 +1,6 @@ ## Automatic Folder -This is where you put your Chocolatey packages that are automatically packaged up by either [AU](https://chocolatey.org/packages/au) or [Ketarin](https://chocolatey.org/packages/ketarin)/[ChocolateyPackageUpdater](https://chocolatey.org/packages/chocolateypackageupdater). - -### Ketarin / ChocolateyPackageUpdater (chocopkgup) - -You want to drop the actual Ketarin files (job file exports) in the top-level ketarin folder to keep them separate from the packages themselves. - -The following packages implement this strategy of auto updates: - -* 1password -* git.install - -There is also an _output folder where the automatic packaging files with tokens to do token replacment and output package files with actual values in this folder. This folder is necessary for chocopkgup to do its work. You can decide whether to commit this set of folders or not. We recommend committing it as it makes it easier to do one off fixes and contributors to submit fixes for a package. - -### Automatic Updater (AU) - -AU works with packages without automatic package tokens necessary. So you can treat the packages as normal. +This is where you put your Chocolatey packages that are automatically packaged up by [AU](https://chocolatey.org/packages/au). Execute `update_all.ps1` in the repository root to run [AU](https://chocolatey.org/packages/au) updater with default options. diff --git a/automatic/_output/1password/1password.nuspec b/automatic/_output/1password/1password.nuspec deleted file mode 100644 index 0e1698c22..000000000 --- a/automatic/_output/1password/1password.nuspec +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - 1password - - - - 4.6.0.604 - https://github.com/ferventcoder/chocolatey-packages - - Rob Reynolds - - - - - 1Password (Install) - AgileBits - - https://1password.com/ - https://cdn.rawgit.com/ferventcoder/chocolatey-packages/02c21bebe5abb495a56747cbb9b4b5415c933fc0/icons/1password.png - AgileBits - - https://support.1password.com/legal/ - true - - - - 1password password keystore keys saver admin - 1Password - Have you ever forgotten a password? - 1Password – Too many passwords to remember? - -1Password can create strong, unique passwords for you, remember them, and restore them, all directly in your web browser. - - -**Please Note**: This is an automatically updated package. If you find it is -out of date by more than a day or two, please contact the maintainer(s) and -let them know the package is no longer updating correctly. - - - - - - - - - - diff --git a/automatic/_output/1password/tools/chocolateyinstall.ps1 b/automatic/_output/1password/tools/chocolateyinstall.ps1 deleted file mode 100644 index 5c7380d6d..000000000 --- a/automatic/_output/1password/tools/chocolateyinstall.ps1 +++ /dev/null @@ -1,17 +0,0 @@ -$ErrorActionPreference = 'Stop'; -$packageName= '1password' # arbitrary name for the package, used in messages -$toolsDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)" - -$packageArgs = @{ - packageName = $packageName - unzipLocation = $toolsDir - fileType = 'exe' - url = 'https://d13itkw33a7sus.cloudfront.net/dist/1P/win4/1Password-4.6.0.604.exe' - softwareName = '1Password*' - checksum = '3c6f9f51f5a4c44ceced089cdee8c840f18d96f652b4fe95e16d166859767076' - checksumType = 'sha256' - silentArgs = '/VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-' - validExitCodes= @(0) -} - -Install-ChocolateyPackage @packageArgs \ No newline at end of file diff --git a/automatic/_output/README.md b/automatic/_output/README.md deleted file mode 100644 index f38018c5f..000000000 --- a/automatic/_output/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# Output Folder - -When using Ketarin / Chocolatey Package Updater (chocopkgup) combo for keeping packages up to date, this folder will contain the output of generating those packages. - -This is the folder where chocopkgup will point to when configured to use the automatic folder (the parent folder of this) as the PackagesFolder. - -You will want to configure chocopkgup (chocopkgup.exe.config file in the package folder) to point to this directory. diff --git a/automatic/_output/git.install/git.install.nuspec b/automatic/_output/git.install/git.install.nuspec deleted file mode 100644 index 8d0cecc94..000000000 --- a/automatic/_output/git.install/git.install.nuspec +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - git.install - - - - 2.9.3 - https://github.com/ferventcoder/chocolatey-packages - - Rob Reynolds, Darwin Sanoy - - - - - Git (Install) - Johannes Schindelin, msysgit Committers - https://git-for-windows.github.io/ - https://cdn.rawgit.com/ferventcoder/chocolatey-packages/02c21bebe5abb495a56747cbb9b4b5415c933fc0/icons/git.svg - http://www.gnu.org/licenses/old-licenses/gpl-2.0.html - false - https://github.com/git-for-windows/git - http://git-scm.com/doc - http://groups.google.com/group/git-for-windows - https://github.com/git-for-windows/git/issues - git vcs dvcs version control msysgit admin - Git (for Windows) – Fast Version Control - -Git (for Windows) – Git is a powerful distributed Source Code Management tool. If you just want to use Git to do your version control in Windows, you will need to download Git for Windows, run the installer, and you are ready to start. - -Note: Git for Windows is a project run by volunteers, so if you want it to improve, volunteer! - -### Package Specifics -The package uses default install options minus cheetah integration and desktop icons. Cheetah prevents a good upgrade scenario, so it has been removed. - -#### Package Parameters -The following package parameters can be set: - - * `/GitOnlyOnPath` - this puts gitinstall\cmd on path. This is also done by default if no package parameters are set. - * `/GitAndUnixToolsOnPath` - this puts gitinstall\bin on path. This setting will override `/GitOnlyOnPath`. - * `/NoAutoCrlf` - this setting only affects new installs, it will not override an existing `.gitconfig`. This will ensure 'Checkout as is, commit as is' - * `/WindowsTerminal` - this makes vim use the regular Windows terminal instead of MinTTY terminal - -These parameters can be passed to the installer with the use of `-params`. -For example: `-params '"/GitAndUnixToolsOnPath /NoAutoCrlf"'`. - -**Please Note**: This is an automatically updated package. If you find it is -out of date by more than a day or two, please contact the maintainer(s) and -let them know the package is no longer updating correctly. - - - - - - - - diff --git a/automatic/_output/git.install/tools/chocolateyInstall.ps1 b/automatic/_output/git.install/tools/chocolateyInstall.ps1 deleted file mode 100644 index 83e18a3ab..000000000 --- a/automatic/_output/git.install/tools/chocolateyInstall.ps1 +++ /dev/null @@ -1,145 +0,0 @@ -$registryKeyName = 'Git_is1' -$packageId = 'git.install' -$fileType = 'exe' -$fileArgs = $( - '/VERYSILENT /NORESTART /NOCANCEL /SP- ' + - '/COMPONENTS="icons,icons\quicklaunch,ext,ext\shellhere,ext\guihere,assoc,assoc_sh" /LOG' -) -$url = 'https://github.com/git-for-windows/git/releases/download/v2.9.3.windows.1/Git-2.9.3-32-bit.exe' -$url64 = 'https://github.com/git-for-windows/git/releases/download/v2.9.3.windows.1/Git-2.9.3-64-bit.exe' -$softwareName = 'Git*' -$checksum = 'd6b4a19536ad408018688f1242ab0d1f5dc5544109662bfddf915f685eba58a9' -$checksum64 = '1a642cf2914e18fa868b1ed2c6d1df4a46ba8ef30355fd1965850895a658e024' -$checksumType = 'sha256' - -$arguments = @{}; -# /GitOnlyOnPath /GitAndUnixToolsOnPath /NoAutoCrlf -$packageParameters = $env:chocolateyPackageParameters; - -# Default the values -$useWindowsTerminal = $false -$gitCmdOnly = $false -$unixTools = $false -$noAutoCrlf = $false # this does nothing unless true - -# Now parse the packageParameters using good old regular expression -if ($packageParameters) { - $match_pattern = "\/(?