Skip to content

(chore): Use variable as bucket name in scripts #1068

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.

Sign up for GitHub

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

Open
AkariiinMKII wants to merge 3 commits into
base: master
Choose a base branch
from
Open

(chore): Use variable as bucket name in scripts #1068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c5baf8c
(chore): Use variable as bucket name in scripts
AkariiinMKII Sep 30, 2026
efc7f88
neteasemusic: Update checkver method, update to version 3.1.40.205461
AkariiinMKII Oct 1, 2026
a4718e5
miniforge: Update checkver method, update to version 26.7.2-0
AkariiinMKII Oct 1, 2026
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
2 changes: 1 addition & 1 deletion bucket/bee.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"$binScript = \"@echo off`n%~dp0bee.exe --config %~dp0data\\bee.yaml %*\"",
"New-Item -Force -Path \"$dir\\bee.cmd\" -ItemType File -Value $binScript | Out-Null",
"# Copy service helper",
"$serviceHelper = $(Join-Path $(Find-BucketDirectory -Root -Name dorado) scripts/bee/beesvc.cmd)",
"$serviceHelper = $(Join-Path $(Find-BucketDirectory -Root -Name $bucket) scripts/bee/beesvc.cmd)",
"Copy-Item -Path $serviceHelper -Destination $dir"
]
},
Expand Down
4 changes: 2 additions & 2 deletions bucket/bilibili.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
"script": [
"Remove-Item \"$dir\\*\" -Exclude 'app-64.7z' -Force -Recurse",
"Expand-7zipArchive \"$dir\\app-64.7z\" \"$dir\" -Removal",
"Import-Module $(Join-Path $(Find-BucketDirectory -Root -Name dorado) scripts/DoradoUtils.psm1)",
"Import-Module $(Join-Path $(Find-BucketDirectory -Root -Name $bucket) scripts/DoradoUtils.psm1)",
"Mount-ExternalRuntimeData -Source \"$persist_dir\\UserData\" -Target \"$env:APPDATA\\bilibili\"",
"Remove-Module -Name DoradoUtils"
]
},
"uninstaller": {
"script": [
"Import-Module $(Join-Path $(Find-BucketDirectory -Root -Name dorado) scripts/DoradoUtils.psm1)",
"Import-Module $(Join-Path $(Find-BucketDirectory -Root -Name $bucket) scripts/DoradoUtils.psm1)",
Comment thread
AkariiinMKII marked this conversation as resolved.
Resolved
"Dismount-ExternalRuntimeData -Target \"$env:APPDATA\\bilibili\"",
"Remove-Module -Name DoradoUtils"
]
Expand Down
4 changes: 2 additions & 2 deletions bucket/miniconda.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
"installer": {
"script": [
"# https://github.com/ScoopInstaller/Scoop/pull/5065",
"Import-Module $(Join-Path $(Find-BucketDirectory -Root -Name dorado) scripts/DoradoUtils.psm1)",
"Import-Module $(Join-Path $(Find-BucketDirectory -Root -Name $bucket) scripts/DoradoUtils.psm1)",
"Move-Item \"$dir\\$fname\" \"$dir\\..\\setup.exe\" | Out-Null",
"Invoke-ExternalCommand2 -Path \"$dir\\..\\setup.exe\" -ArgumentList @('/S', '/InstallationType=JustMe', '/RegisterPython=0', '/AddToPath=0', '/NoRegistry=1', '/NoShortcuts=1', \"/D=$dir\") | Out-Null",
"Remove-Module -Name DoradoUtils"
]
},
"uninstaller": {
"script": [
"Import-Module $(Join-Path $(Find-BucketDirectory -Root -Name dorado) scripts/DoradoUtils.psm1)",
"Import-Module $(Join-Path $(Find-BucketDirectory -Root -Name $bucket) scripts/DoradoUtils.psm1)",
"Invoke-ExternalCommand2 -Path \"$dir\\Uninstall-Miniconda3.exe\" -ArgumentList @('/S') | Out-Null",
"Remove-Module -Name DoradoUtils"
]
Expand Down
15 changes: 6 additions & 9 deletions bucket/miniforge.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
{
"version": "26.3.2-3",
"version": "26.7.2-0",
"homepage": "https://github.com/conda-forge/miniforge",
"description": "A minimal conda distribution specific to conda-forge.",
"license": "BSD-3-Clause",
"architecture": {
"64bit": {
"url": "https://github.com/conda-forge/miniforge/releases/download/26.3.2-3/Miniforge3-26.3.2-3-Windows-x86_64.exe",
"hash": "14a8635465b5190537ddad6286746ffebbc55a1ed2a7bb14a506595fe3191e1e"
"url": "https://github.com/conda-forge/miniforge/releases/download/26.7.2-0/Miniforge3-26.7.2-0-Windows-x86_64.exe",
"hash": "71cf9519087be74fa53021219ff292beb2fc05fa49e0bb6eb0e0b6b14fccbaab"
}
},
"installer": {
"script": [
"# https://github.com/ScoopInstaller/Scoop/pull/5065",
"Import-Module $(Join-Path $(Find-BucketDirectory -Root -Name dorado) scripts/DoradoUtils.psm1)",
"Import-Module $(Join-Path $(Find-BucketDirectory -Root -Name $bucket) scripts/DoradoUtils.psm1)",
"Move-Item \"$dir\\$fname\" \"$dir\\..\\setup.exe\" | Out-Null",
"Invoke-ExternalCommand2 -Path \"$dir\\..\\setup.exe\" -ArgumentList @('/S', '/InstallationType=JustMe', '/RegisterPython=0', '/AddToPath=0', '/NoRegistry=1', '/NoShortcuts=1', \"/D=$dir\") | Out-Null",
"Remove-Module -Name DoradoUtils"
]
},
"uninstaller": {
"script": [
"Import-Module $(Join-Path $(Find-BucketDirectory -Root -Name dorado) scripts/DoradoUtils.psm1)",
"Import-Module $(Join-Path $(Find-BucketDirectory -Root -Name $bucket) scripts/DoradoUtils.psm1)",
"Start-Process \"$dir\\Uninstall-Miniforge3.exe\" -ArgumentList '/S' -Wait | Out-Null",
"Remove-Module -Name DoradoUtils"
]
Expand All @@ -33,10 +33,7 @@
"# Invoke hook for current shell session",
"(& $dir\\scripts\\conda.exe shell.powershell hook) | Out-String | Invoke-Expression"
],
"checkver": {
"github": "https://github.com/conda-forge/miniforge",
"regex": "tag/([\\d.-]+)"
},
"checkver": "github",
Comment thread
AkariiinMKII marked this conversation as resolved.
Resolved
"autoupdate": {
"architecture": {
"64bit": {
Expand Down
4 changes: 2 additions & 2 deletions bucket/msys2-cn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"installer": {
"script": [
"Import-Module $(Join-Path $(Find-BucketDirectory -Root -Name dorado) scripts/DoradoUtils.psm1)",
"Import-Module $(Join-Path $(Find-BucketDirectory -Root -Name $bucket) scripts/DoradoUtils.psm1)",
"# 0x00: Disable pacman Key Refreshing to speed up the setup: https://github.com/msys2/setup-msys2/issues/45",
"$postScript = \"$dir\\etc\\post-install\\07-pacman-key.post\"",
"(Get-Content $postScript) -replace ' --refresh-keys', ' --version' | Set-Content $postScript",
Expand Down Expand Up @@ -54,7 +54,7 @@
},
"uninstaller": {
"script": [
"Import-Module $(Join-Path $(Find-BucketDirectory -Root -Name dorado) scripts/DoradoUtils.psm1)",
"Import-Module $(Join-Path $(Find-BucketDirectory -Root -Name $bucket) scripts/DoradoUtils.psm1)",
"$msys2Pskill = \"ps -ef | grep '[?]' | awk '{print `$2}' | xargs -r kill\"",
"# 0x00: Stop potential gpg-agent processes",
"$args1 = \"gpgconf --kill gpg-agent;$msys2Pskill\"",
Expand Down
21 changes: 12 additions & 9 deletions bucket/neteasemusic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
{
"homepage": "https://music.163.com/",
"description": "The official NetEase Cloud Music client.",
"version": "3.1.30.205130",
"version": "3.1.40.205461",
"license": {
"identifier": "EULA",
"url": "https://music.163.com/html/web2/service.html"
},
"architecture": {
"64bit": {
"url": "https://d8.music.126.net/dmusic2/NeteaseCloudMusic_Music_official_3.1.30.205130_64.exe#/dl.7z",
"hash": "9ae0f1fabc4286bc4121176d864b871e85c7b5bc24b40a41883dd19ecbe6aba5"
"url": "https://d8.music.126.net/dmusic2/NeteaseCloudMusic_Music_official_3.1.40.205461_64.exe#/dl.7z",
"hash": "b2d80aefaa2869e26986c6446d05119448fa30b2df2b72dd70c96924af2922b7"
},
"32bit": {
"url": "https://d8.music.126.net/dmusic2/NeteaseCloudMusic_Music_official_3.1.30.205130_32.exe#/dl.7z",
"hash": "b38e0448c75451c7f52799153197120a88322a09b080db1489e7917d73bf8ae9"
"url": "https://d8.music.126.net/dmusic2/NeteaseCloudMusic_Music_official_3.1.40.205461_32.exe#/dl.7z",
"hash": "eeec4f61eb872373df37ab9c558d41ba7f9052333dad49b5f29561c7403416b0"
}
},
"installer": {
"script": [
"Get-ChildItem \"$dir\\redist_packages\" | Move-Item -Destination \"$dir\" -Force",
"Import-Module $(Join-Path $(Find-BucketDirectory -Root -Name dorado) scripts/DoradoUtils.psm1)",
"Import-Module $(Join-Path $(Find-BucketDirectory -Root -Name $bucket) scripts/DoradoUtils.psm1)",
"Mount-ExternalRuntimeData -Source \"$persist_dir\\appdata\" -Target \"$env:LOCALAPPDATA\\Netease\\CloudMusic\"",
"Remove-Module -Name DoradoUtils"
]
},
"post_install": "Remove-Item \"$dir\\`$PLUGINSDIR\",\"$dir\\redist_packages\" -Force -Recurse",
"uninstaller": {
"script": [
"Import-Module $(Join-Path $(Find-BucketDirectory -Root -Name dorado) scripts/DoradoUtils.psm1)",
"Import-Module $(Join-Path $(Find-BucketDirectory -Root -Name $bucket) scripts/DoradoUtils.psm1)",
"Dismount-ExternalRuntimeData -Target \"$env:LOCALAPPDATA\\Netease\\CloudMusic\"",
"Remove-Module -Name DoradoUtils"
]
Expand All @@ -41,8 +41,11 @@
],
"checkver": {
"url": "https://music.163.com/api/appcustomconfig/get",
"jsonpath": "$.data.web-new-download.pc64.downloadUrl",
"regex": "NeteaseCloudMusic_Music_official_([\\d.]+)_64.exe"
"script": [
"# The checkver url is treated as a placeholder because the homepage url returns an incorrect charset name 'utf8' (it should be 'utf-8'), which causes error in checkver progress.",
"return $(Invoke-WebRequest -Uri 'https://music.163.com/download/pc/latest' -Method Head -UseBasicParsing | Select-Object -ExpandProperty RawContent)"
],
"regex": "NeteaseCloudMusic_Music_official_([\\d.]+)_[\\d]+.exe"
},
"autoupdate": {
"architecture": {
Expand Down
6 changes: 3 additions & 3 deletions bucket/qqmusic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@
"installer": {
"script": [
"# simulate instok check",
"$helperScript = $(Join-Path $(Find-BucketDirectory -Root -Name dorado) scripts/qqmusic/instok)",
"$helperScript = $(Join-Path $(Find-BucketDirectory -Root -Name $bucket) scripts/qqmusic/instok)",
"Copy-Item -Path $helperScript -Destination $dir",
"# handle runtime cache",
"Import-Module $(Join-Path $(Find-BucketDirectory -Root -Name dorado) scripts/DoradoUtils.psm1)",
"Import-Module $(Join-Path $(Find-BucketDirectory -Root -Name $bucket) scripts/DoradoUtils.psm1)",
"Mount-ExternalRuntimeData -Source \"$persist_dir\\appdata\" -Target \"$env:APPDATA\\Tencent\\QQMusic\"",
"Remove-Module -Name DoradoUtils"
]
},
"uninstaller": {
"script": [
"Import-Module $(Join-Path $(Find-BucketDirectory -Root -Name dorado) scripts/DoradoUtils.psm1)",
"Import-Module $(Join-Path $(Find-BucketDirectory -Root -Name $bucket) scripts/DoradoUtils.psm1)",
"Dismount-ExternalRuntimeData -Target \"$env:APPDATA\\Tencent\\QQMusic\"",
"Remove-Module -Name DoradoUtils"
]
Expand Down
4 changes: 2 additions & 2 deletions deprecated/clash-for-windows.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
" Copy-Item -Path \"$env:USERPROFILE\\.config\\clash\\*\" -Destination \"$persist_dir\\data\" -Recurse -Container",
" }",
"}",
"Import-Module $(Join-Path $(Find-BucketDirectory -Root -Name dorado) scripts/DoradoUtils.psm1)",
"Import-Module $(Join-Path $(Find-BucketDirectory -Root -Name $bucket) scripts/DoradoUtils.psm1)",
"Mount-ExternalRuntimeData -Source \"$persist_dir\\clash_win\" -Target \"$env:APPDATA\\clash_win\"",
"Remove-Module -Name DoradoUtils"
]
},
"uninstaller": {
"script": [
"Import-Module $(Join-Path $(Find-BucketDirectory -Root -Name dorado) scripts/DoradoUtils.psm1)",
"Import-Module $(Join-Path $(Find-BucketDirectory -Root -Name $bucket) scripts/DoradoUtils.psm1)",
"Dismount-ExternalRuntimeData -Target \"$env:APPDATA\\clash_win\"",
"Remove-Module -Name DoradoUtils"
]
Expand Down
Loading