From c2443c0ebfc87538171152e0b8d1d596bda298ec Mon Sep 17 00:00:00 2001 From: insertokername <111150085+insertokername@users.noreply.github.com> Date: Wed, 22 May 2024 09:45:34 +0300 Subject: [PATCH 1/4] added the ability to specify @ version when installing from url --- lib/core.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/core.ps1 b/lib/core.ps1 index e9311eb9cf..2ecde7ae5a 100644 --- a/lib/core.ps1 +++ b/lib/core.ps1 @@ -1192,7 +1192,7 @@ function applist($apps, $global) { } function parse_app([string]$app) { - if ($app -match '^(?:(?[a-zA-Z0-9-_.]+)/)?(?.*\.json$|[a-zA-Z0-9-_.]+)(?:@(?.*))?$') { + if ($app -match '^(?:(?[a-zA-Z0-9-_.]+)/)?(?.*\.json|[a-zA-Z0-9-_.]+)(?:@(?.*))?$') { return $Matches['app'], $Matches['bucket'], $Matches['version'] } else { return $app, $null, $null From 5150f780d1fc52e180163cab5b86c23efeeffb05 Mon Sep 17 00:00:00 2001 From: insertokername Date: Wed, 22 May 2024 10:51:06 +0300 Subject: [PATCH 2/4] updated documentation and CHANGELOG --- CHANGELOG.md | 1 + libexec/scoop-install.ps1 | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 539f1f06aa..f66d66a23b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - **scoop-search:** Use SQLite for caching apps to speed up local search ([#5851](https://github.com/ScoopInstaller/Scoop/issues/5851), [#5918](https://github.com/ScoopInstaller/Scoop/issues/5918), [#5946](https://github.com/ScoopInstaller/Scoop/issues/5946), [#5949](https://github.com/ScoopInstaller/Scoop/issues/5949), [#5955](https://github.com/ScoopInstaller/Scoop/issues/5955), [#5966](https://github.com/ScoopInstaller/Scoop/issues/5966), [#5967](https://github.com/ScoopInstaller/Scoop/issues/5967), [#5981](https://github.com/ScoopInstaller/Scoop/issues/5981)) - **core:** New cache filename format ([#5929](https://github.com/ScoopInstaller/Scoop/issues/5929)) +- **core:** Added the ability to install specific version of app from URL/file link ([#5977](https://github.com/ScoopInstaller/Scoop/issues/5977)) ### Bug Fixes diff --git a/libexec/scoop-install.ps1 b/libexec/scoop-install.ps1 index 8d12a9fee9..173bcd868f 100644 --- a/libexec/scoop-install.ps1 +++ b/libexec/scoop-install.ps1 @@ -10,9 +10,15 @@ # To install an app from a manifest at a URL: # scoop install https://raw.githubusercontent.com/ScoopInstaller/Main/master/bucket/runat.json # +# To install a different version of the app from a URL: +# scoop install https://raw.githubusercontent.com/ScoopInstaller/Main/master/bucket/neovim.json@0.9.0 +# # To install an app from a manifest on your computer # scoop install \path\to\app.json # +# To install an app from a manifest on your computer +# scoop install \path\to\app.json@version +# # Options: # -g, --global Install the app globally # -i, --independent Don't install dependencies automatically From 05be38549231c8996dd87b91f9748895488f0ef2 Mon Sep 17 00:00:00 2001 From: Hsiao-nan Cheung Date: Thu, 23 May 2024 16:45:25 +0800 Subject: [PATCH 3/4] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f66d66a23b..fc27ba382f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ - **scoop-search:** Use SQLite for caching apps to speed up local search ([#5851](https://github.com/ScoopInstaller/Scoop/issues/5851), [#5918](https://github.com/ScoopInstaller/Scoop/issues/5918), [#5946](https://github.com/ScoopInstaller/Scoop/issues/5946), [#5949](https://github.com/ScoopInstaller/Scoop/issues/5949), [#5955](https://github.com/ScoopInstaller/Scoop/issues/5955), [#5966](https://github.com/ScoopInstaller/Scoop/issues/5966), [#5967](https://github.com/ScoopInstaller/Scoop/issues/5967), [#5981](https://github.com/ScoopInstaller/Scoop/issues/5981)) - **core:** New cache filename format ([#5929](https://github.com/ScoopInstaller/Scoop/issues/5929)) -- **core:** Added the ability to install specific version of app from URL/file link ([#5977](https://github.com/ScoopInstaller/Scoop/issues/5977)) +- **core:** Added the ability to install specific version of app from URL/file link ([#5988](https://github.com/ScoopInstaller/Scoop/issues/5988)) ### Bug Fixes From 67c5bc99c3e66ecedd35bc1c520e0dcc5f12f85b Mon Sep 17 00:00:00 2001 From: Hsiao-nan Cheung Date: Thu, 23 May 2024 23:05:05 +0800 Subject: [PATCH 4/4] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fc27ba382f..001ac5798e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ - **scoop-search:** Use SQLite for caching apps to speed up local search ([#5851](https://github.com/ScoopInstaller/Scoop/issues/5851), [#5918](https://github.com/ScoopInstaller/Scoop/issues/5918), [#5946](https://github.com/ScoopInstaller/Scoop/issues/5946), [#5949](https://github.com/ScoopInstaller/Scoop/issues/5949), [#5955](https://github.com/ScoopInstaller/Scoop/issues/5955), [#5966](https://github.com/ScoopInstaller/Scoop/issues/5966), [#5967](https://github.com/ScoopInstaller/Scoop/issues/5967), [#5981](https://github.com/ScoopInstaller/Scoop/issues/5981)) - **core:** New cache filename format ([#5929](https://github.com/ScoopInstaller/Scoop/issues/5929)) -- **core:** Added the ability to install specific version of app from URL/file link ([#5988](https://github.com/ScoopInstaller/Scoop/issues/5988)) +- **install:** Added the ability to install specific version of app from URL/file link ([#5988](https://github.com/ScoopInstaller/Scoop/issues/5988)) ### Bug Fixes