Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(chore): Explicit declaration of source(bucket name) of suggested manifests #973

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bucket/android-studio-beta.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
},
"suggest": {
"SDK": [
"android-clt",
"android-sdk"
"main/android-clt",
"extras/android-sdk"
]
},
"architecture": {
Expand Down
4 changes: 2 additions & 2 deletions bucket/android-studio-canary.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
},
"suggest": {
"SDK": [
"android-clt",
"android-sdk"
"main/android-clt",
"extras/android-sdk"
]
},
"architecture": {
Expand Down
18 changes: 9 additions & 9 deletions bucket/ant19.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
{
"version": "1.9.16",
"homepage": "https://ant.apache.org/",
"description": "Apache Ant, a Java library and command-line tool for compiling, assembling, testing and running Java and non-Java applications. (version 1.9)",
"homepage": "https://ant.apache.org/",
"license": "Apache 2.0",
"suggest": {
"JDK": [
"java/oraclejdk",
"java/openjdk"
]
},
"url": "https://www.apache.org/dist/ant/binaries/apache-ant-1.9.16-bin.zip",
"hash": "sha512:b9324cffeb5b113fa289126db1408b9a0125757b598d763f076fc5deec97fb43f27979974cadcac79b6573d84dcb2d1d5bf59b7972fb2abe5ed3d9fed445b04e",
"extract_dir": "apache-ant-1.9.16",
"env_add_path": "bin",
"env_set": {
"ANT_HOME": "$dir"
},
"suggest": {
"JDK": [
"java/oraclejdk",
"java/openjdk"
]
},
"checkver": {
"url": "https://ant.apache.org/bindownload.cgi",
"regex": "apache-ant-(1.9.\\d+)-bin.zip"
},
"autoupdate": {
"url": "https://www.apache.org/dist/ant/binaries/apache-ant-$version-bin.zip",
"extract_dir": "apache-ant-$version",
"hash": {
"url": "$url.sha512"
}
},
"extract_dir": "apache-ant-$version"
}
}
2 changes: 1 addition & 1 deletion bucket/camunda-operate1.3.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"suggest": {
"JDK": "java/openjdk",
"Zeebe": "zeebe1.3",
"Zeebe": "versions/zeebe1.3",
"ElasticSearch": "extras/elasticsearch"
},
"architecture": {
Expand Down
20 changes: 10 additions & 10 deletions bucket/composer1.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@
"homepage": "https://getcomposer.org/",
"license": "MIT",
"notes": "'composer selfupdate --1' is aliased to 'scoop update composer'",
"suggest": {
"PHP": [
"main/php",
"main/php-nts"
]
},
"url": "https://getcomposer.org/download/1.10.26/composer.phar",
"hash": "cbfe1f85276c57abe464d934503d935aa213494ac286275c8dfabfa91e3dbdc4",
"pre_install": [
Expand All @@ -16,24 +22,18 @@
" Move-Item \"$env:Appdata\\Composer\" \"$persist_dir\\home\" -Force",
"}"
],
"env_add_path": "home\\vendor\\bin",
"env_set": {
"COMPOSER_HOME": "$persist_dir\\home"
},
"bin": [
"composer.ps1",
[
"composer.ps1",
"composer1"
]
],
"env_set": {
"COMPOSER_HOME": "$persist_dir\\home"
},
"env_add_path": "home\\vendor\\bin",
"persist": "home",
"suggest": {
"PHP": [
"php",
"php-nts"
]
},
"checkver": {
"url": "https://github.com/composer/composer/releases",
"regex": "tag/(1\\.[\\d.]+)[^-]"
Expand Down
17 changes: 7 additions & 10 deletions bucket/docker-nightly.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,14 @@
"For help, see https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-docker/configure-docker-daemon"
],
"suggest": {
"Linux container support on Windows": "lcow",
"Docker Compose": "docker-compose",
"Docker Machine": "docker-machine",
"Kubernetes Standalone": "minikube",
"Kubernetes Client": "kubectl",
"compose.yml to kubernetes.yml": "kompose"
"sudo": "gsudo",
"Docker Compose": "main/docker-compose",
"Docker Machine": "main/docker-machine",
"Kubernetes Client": "main/kubectl",
"Kubernetes Standalone": "main/minikube",
"Linux container support on Windows": "unknown/lcow",
Copy link
Member Author

@HUMORCE HUMORCE Feb 2, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rashil2000 This manifest appears to have been lost. ScoopInstaller/Main#2972

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I remember putting it somewhere in the deprecated folder...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After being removed from main bucket, it was not created anywhere.

https://github.com/search?q=org%3AScoopInstaller+lcow&type=commits

"compose.yml to kubernetes.yml": "main/kompose"
},
"depends": [
"sudo",
"lcow"
],
"url": "https://master.dockerproject.org/windows/x86_64/docker.zip",
"extract_dir": "docker",
"bin": [
Expand Down
2 changes: 1 addition & 1 deletion bucket/ffmpeg-yt-dlp.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"homepage": "https://github.com/yt-dlp/FFmpeg-Builds",
"license": "MIT",
"suggest": {
"yt-dlp": "yt-dlp"
"yt-dlp": "main/yt-dlp"
},
"architecture": {
"64bit": {
Expand Down
4 changes: 2 additions & 2 deletions bucket/gn.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"homepage": "https://gn.googlesource.com/gn",
"license": "BSD-3-Clause",
"suggest": {
"ninja": "ninja",
"Python3": "python"
"ninja": "main/ninja",
"Python3": "main/python"
},
"architecture": {
"64bit": {
Expand Down
2 changes: 1 addition & 1 deletion bucket/goneovim-nightly.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"homepage": "https://github.com/akiyosi/goneovim",
"license": "MIT",
"suggest": {
"neovim": "neovim"
"neovim": "main/neovim"
},
"architecture": {
"64bit": {
Expand Down
2 changes: 1 addition & 1 deletion bucket/haskell863.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
],
"env_add_path": "lib\\extralibs\\bin",
"suggest": {
"Stack": "stack"
"Stack": "main/stack"
},
"notes": "For Haskell Stack, please install 'stack'."
}
2 changes: 1 addition & 1 deletion bucket/jdownloader.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"homepage": "https://jdownloader.org",
"license": "Shareware|AGPL-3.0-only",
"suggest": {
"JRE": "java/adopt8-hotspot-jre"
"JRE": "java/temurin8-jre"
},
"url": [
"http://installer.jdownloader.org/JDownloader.jar",
Expand Down
2 changes: 1 addition & 1 deletion bucket/neovide-dev.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"homepage": "https://github.com/Kethku/neovide",
"license": "MIT",
"suggest": {
"neovim": "neovim"
"neovim": "main/neovim"
},
"architecture": {
"64bit": {
Expand Down
2 changes: 1 addition & 1 deletion bucket/openrgb-nightly.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"homepage": "https://openrgb.org",
"license": "GPL-2.0-only",
"suggest": {
"vcredist": "vcredist2022"
"vcredist": "extras/vcredist2022"
},
"architecture": {
"64bit": {
Expand Down
2 changes: 1 addition & 1 deletion bucket/openvpn-w7.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"homepage": "https://openvpn.net",
"license": "GPL-2.0-only",
"suggest": {
"openssl": "openssl"
"openssl": "main/openssl"
},
"url": "https://swupdate.openvpn.org/community/releases/openvpn-install-2.4.11-I602-Win7.exe",
"hash": "d419938e490bc124689eae6693d9fd6f22bd256b6adff9402a620f0e7d4a827d",
Expand Down
10 changes: 5 additions & 5 deletions bucket/oracle-instant-client19.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
"identifier": "Freeware",
"url": "https://www.oracle.com/downloads/licenses/instant-client-lic.html"
},
"suggest": {
"Visual C++ 2017 Redistributable": "extras/vcredist2017"
},
"architecture": {
"64bit": {
"url": "https://download.oracle.com/otn_software/nt/instantclient/1917000/instantclient-basic-windows.x64-19.17.0.0.0dbru.zip",
Expand All @@ -24,16 +27,13 @@
}
}
},
"suggest": {
"Visual C++ 2017 Redistributable": "extras/vcredist2017"
},
"extract_dir": "instantclient_19_17",
"env_add_path": ".",
"persist": "network\\admin",
"checkver": {
"useragent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64)",
"url": "https://www.oracle.com/database/technologies/instant-client/winx64-64-downloads.html",
"regex": "Version (19[\\d.]+)",
"useragent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64)"
"regex": "Version (19[\\d.]+)"
},
"autoupdate": {
"architecture": {
Expand Down
2 changes: 1 addition & 1 deletion bucket/qt-creator-beta.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"homepage": "https://doc.qt.io/qtcreator/index.html",
"license": "GPL-3.0-only",
"suggest": {
"vcredist": "vcredist2022"
"vcredist": "extras/vcredist2022"
},
"architecture": {
"64bit": {
Expand Down
12 changes: 6 additions & 6 deletions bucket/ruby24.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
"description": "Ruby, a dynamic programming language with a focus on simplicity and productivity. (version 2.4)",
"homepage": "https://rubyinstaller.org",
"license": "BSD-3-Clause",
"notes": "Install MSYS2 via 'scoop install msys2' and then run 'ridk install' to install the toolchain!",
"suggest": {
"MSYS2": "main/msys2"
},
"architecture": {
"64bit": {
"url": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.4.10-1/rubyinstaller-2.4.10-1-x64.7z",
Expand All @@ -15,7 +19,7 @@
"extract_dir": "rubyinstaller-2.4.10-1-x86"
}
},
"persist": "gems",
"post_install": "gem install rake",
"env_add_path": [
"bin",
"gems\\bin"
Expand All @@ -24,9 +28,5 @@
"GEM_HOME": "$dir\\gems",
"GEM_PATH": "$dir\\gems"
},
"suggest": {
"MSYS2": "msys2"
},
"post_install": "gem install rake",
"notes": "Install MSYS2 via 'scoop install msys2' and then run 'ridk install' to install the toolchain!"
"persist": "gems"
}
12 changes: 6 additions & 6 deletions bucket/ruby25.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
"description": "Ruby, a dynamic programming language with a focus on simplicity and productivity. (version 2.5)",
"homepage": "https://rubyinstaller.org",
"license": "BSD-3-Clause",
"notes": "Install MSYS2 via 'scoop install msys2' and then run 'ridk install' to install the toolchain!",
"suggest": {
"MSYS2": "main/msys2"
},
"architecture": {
"64bit": {
"url": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.5.9-1/rubyinstaller-2.5.9-1-x64.7z",
Expand All @@ -15,7 +19,7 @@
"extract_dir": "rubyinstaller-2.5.9-1-x86"
}
},
"persist": "gems",
"post_install": "gem install rake",
"env_add_path": [
"bin",
"gems\\bin"
Expand All @@ -24,9 +28,5 @@
"GEM_HOME": "$dir\\gems",
"GEM_PATH": "$dir\\gems"
},
"suggest": {
"MSYS2": "msys2"
},
"post_install": "gem install rake",
"notes": "Install MSYS2 via 'scoop install msys2' and then run 'ridk install' to install the toolchain!"
"persist": "gems"
}
14 changes: 7 additions & 7 deletions bucket/ruby26.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
{
"version": "2.6.10-1",
"homepage": "https://rubyinstaller.org",
"description": "Ruby, a dynamic programming language with a focus on simplicity and productivity. (version 2.6)",
"homepage": "https://rubyinstaller.org",
"license": "BSD-3-Clause",
"notes": "Install MSYS2 via 'scoop install msys2' and then run 'ridk install' to install the toolchain!",
"suggest": {
"MSYS2": "main/msys2"
},
"architecture": {
"64bit": {
"url": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.10-1/rubyinstaller-2.6.10-1-x64.7z",
Expand All @@ -15,7 +19,7 @@
"extract_dir": "rubyinstaller-2.6.10-1-x86"
}
},
"persist": "gems",
"post_install": "gem install rake",
"env_add_path": [
"bin",
"gems\\bin"
Expand All @@ -24,9 +28,5 @@
"GEM_HOME": "$dir\\gems",
"GEM_PATH": "$dir\\gems"
},
"suggest": {
"MSYS2": "msys2"
},
"post_install": "gem install rake",
"notes": "Install MSYS2 via 'scoop install msys2' and then run 'ridk install' to install the toolchain!"
"persist": "gems"
}
2 changes: 1 addition & 1 deletion bucket/ruby27.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "BSD-3-Clause",
"notes": "Install MSYS2 via 'scoop install msys2' and then run 'ridk install' to install the toolchain!",
"suggest": {
"MSYS2": "msys2"
"MSYS2": "main/msys2"
},
"architecture": {
"64bit": {
Expand Down
2 changes: 1 addition & 1 deletion bucket/ruby30.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "BSD-3-Clause",
"notes": "Install MSYS2 via 'scoop install msys2' and then run 'ridk install' to install the toolchain!",
"suggest": {
"MSYS2": "msys2"
"MSYS2": "main/msys2"
},
"architecture": {
"64bit": {
Expand Down
14 changes: 7 additions & 7 deletions bucket/snipaste-beta.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{
"homepage": "https://www.snipaste.com/",
"version": "2.8.3-Beta",
"license": "Freeware",
"description": "Snip & Paste, a simple but powerful snipping tool.",
"homepage": "https://www.snipaste.com/",
"license": "Freeware",
"suggest": {
"vcredist": "extras/vcredist2022"
},
"architecture": {
"64bit": {
"url": "https://bitbucket.org/liule/snipaste/downloads/Snipaste-2.8.3-Beta-x64.zip",
Expand All @@ -14,18 +17,15 @@
}
},
"pre_install": "if (Test-Path \"$persist_dir\\config.ini\") { Copy-Item \"$persist_dir\\config.ini\" \"$dir\\config.ini\" }",
"persist": "history",
"pre_uninstall": "if (Test-Path \"$dir\\config.ini\") { Copy-Item \"$dir\\config.ini\" \"$persist_dir\\config.ini\" }",
"bin": "Snipaste.exe",
"shortcuts": [
[
"Snipaste.exe",
"Snipaste"
]
],
"suggest": {
"vcredist": "extras/vcredist2022"
},
"persist": "history",
"pre_uninstall": "if (Test-Path \"$dir\\config.ini\") { Copy-Item \"$dir\\config.ini\" \"$persist_dir\\config.ini\" }",
"checkver": {
"url": "https://bitbucket.org/liule/snipaste/downloads",
"regex": "Snipaste-(?<main>[\\d.]+)-Beta(?<build>[\\d]*)-x86\\.zip",
Expand Down
Loading