diff --git a/bucket/bee.json b/bucket/bee.json index f40d2968a50..7577b305850 100644 --- a/bucket/bee.json +++ b/bucket/bee.json @@ -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" ] }, diff --git a/bucket/bilibili.json b/bucket/bilibili.json index 7033f632e3f..d9e7756fe43 100644 --- a/bucket/bilibili.json +++ b/bucket/bilibili.json @@ -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)", "Dismount-ExternalRuntimeData -Target \"$env:APPDATA\\bilibili\"", "Remove-Module -Name DoradoUtils" ] diff --git a/bucket/miniconda.json b/bucket/miniconda.json index 16efac1fdf0..226b3f8f0d2 100644 --- a/bucket/miniconda.json +++ b/bucket/miniconda.json @@ -12,7 +12,7 @@ "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" @@ -20,7 +20,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)", "Invoke-ExternalCommand2 -Path \"$dir\\Uninstall-Miniconda3.exe\" -ArgumentList @('/S') | Out-Null", "Remove-Module -Name DoradoUtils" ] diff --git a/bucket/miniforge.json b/bucket/miniforge.json index 1d87c2f6a29..141d6563c9b 100644 --- a/bucket/miniforge.json +++ b/bucket/miniforge.json @@ -1,18 +1,18 @@ { - "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" @@ -20,7 +20,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)", "Start-Process \"$dir\\Uninstall-Miniforge3.exe\" -ArgumentList '/S' -Wait | Out-Null", "Remove-Module -Name DoradoUtils" ] @@ -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", "autoupdate": { "architecture": { "64bit": { diff --git a/bucket/msys2-cn.json b/bucket/msys2-cn.json index 2c12edc83a8..a6628e14323 100644 --- a/bucket/msys2-cn.json +++ b/bucket/msys2-cn.json @@ -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", @@ -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\"", diff --git a/bucket/neteasemusic.json b/bucket/neteasemusic.json index 836a7a697e6..26e498e4988 100644 --- a/bucket/neteasemusic.json +++ b/bucket/neteasemusic.json @@ -1,25 +1,25 @@ { "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" ] @@ -27,7 +27,7 @@ "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" ] @@ -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": { diff --git a/bucket/qqmusic.json b/bucket/qqmusic.json index 4b7a35e0108..d15c3773353 100644 --- a/bucket/qqmusic.json +++ b/bucket/qqmusic.json @@ -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" ] diff --git a/deprecated/clash-for-windows.json b/deprecated/clash-for-windows.json index c79b5546d7f..767fa456fac 100644 --- a/deprecated/clash-for-windows.json +++ b/deprecated/clash-for-windows.json @@ -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" ]