Format manifests

- Remove `scoop-completion` - Add `dotnet-desktop-runtime`
kidonng · Jul 14, 2020 · e80f84e · e80f84e
1 parent 50884c9
commit e80f84e
Show file tree

Hide file tree

Showing 33 changed files with 127 additions and 129 deletions.
diff --git a/README.md b/README.md
@@ -27,8 +27,6 @@ scoop install sushi/<app>
 
 **\*** Non portable (store data outside of Scoop directory)
 
-🐟 Depends on `dorado` bucket (`scoop bucket add dorado https://github.com/chawyehsu/dorado`)
-
 ### [V2Ray](https://www.v2fly.org/) Rulesets
 
 -   [v2ray-domain-list-community](https://github.com/v2ray/domain-list-community)
@@ -58,15 +56,15 @@ Fonts do **not** need administrator rights to **install**, but they are **needed
 
 ### Miscellaneous
 
+-   [dotnet-desktop-runtime](https://dotnet.microsoft.com/)
 -   [fontloadersub](https://github.com/yzwduck/FontLoaderSub)
 -   [listary-beta](https://www.listary.com/beta) # *
 -   [microsoft-edge / microsoft-edge-beta / microsoft-edge-dev / microsoft-edge-canary](https://www.microsoft.com/edge) *
 -   [officetoolplus-beta](https://otp.landian.vip/)
 -   [openhashtab](https://github.com/namazso/OpenHashTab) #
--   [scoop-completion](https://github.com/Moeologist/scoop-completion)
 -   [tencent-meeting](https://meeting.tencent.com/) *
 -   [trojan-qt5](https://github.com/Trojan-Qt5/Trojan-Qt5)
 -   [~~naiveproxy~~](https://github.com/klzgrad/naiveproxy) ([Moved to `main`](https://github.com/ScoopInstaller/Main/pull/1172))
 -   [varpanel](http://implbits.com/products/varpanel/)
 -   [wechat](https://pc.weixin.qq.com/) *
--   [youtube-dl-wpf](https://github.com/database64128/youtube-dl-wpf) 🐟
+-   [youtube-dl-wpf](https://github.com/database64128/youtube-dl-wpf)
diff --git a/bucket/android-clt.json b/bucket/android-clt.json
@@ -6,6 +6,7 @@
         "identifier": "Freeware",
         "url": "https://developer.android.com/studio/terms.html"
     },
+    "notes": "You need to launch sdkmanager with --sdk_root=$env:ANDROID_SDK_ROOT.",
     "url": "https://dl.google.com/android/repository/commandlinetools-win-6609375_latest.zip",
     "hash": "40bba20275180194bebf89bb58c74d712bb93cc401f36bd2f8f32383acf9826c",
     "post_install": [
@@ -36,6 +37,5 @@
             "url": "https://developer.android.com/studio",
             "find": "commandlinetools-win(?:.*\\n){3}.*<td>($sha256)"
         }
-    },
-    "notes": "You need to launch sdkmanager with --sdk_root=$env:ANDROID_SDK_ROOT."
+    }
 }
diff --git a/bucket/dotnet-desktop-runtime.json b/bucket/dotnet-desktop-runtime.json
@@ -0,0 +1,48 @@
+{
+    "version": "3.1.5",
+    "description": "The dotnet desktop runtime enables you to run dotnet desktop applications. This release includes the .NET Core Runtime, you do not need to install it separately.",
+    "homepage": "https://dotnet.microsoft.com/",
+    "license": "MIT",
+    "notes": "This package only contains the .NET Core runtime, install 'dotnet-sdk' instead if you need .NET Core SDK",
+    "depends": "dark",
+    "architecture": {
+        "64bit": {
+            "url": "https://dotnetcli.blob.core.windows.net/dotnet/Runtime/3.1.5/windowsdesktop-runtime-3.1.5-win-x64.exe",
+            "hash": "sha512:5df17bd9fed94727ec5b151e1684bf9cdc6bfd3075f615ab546759ffca0679d23a35fcf7a8961ac014dd5a4ff0d22ef5f7434a072e23122d5c0415fcd4198831"
+        },
+        "32bit": {
+            "url": "https://dotnetcli.blob.core.windows.net/dotnet/Runtime/3.1.5/windowsdesktop-runtime-3.1.5-win-x86.exe",
+            "hash": "sha512:b5e7e49d5b6f4f83a665d1f4c7d83700540f9c888c3c36ccd44f5395138dc1e258a4fcb260845d8ac7e3e5a1513be1666521edeaf6dfd67669a04a1290cda7e1"
+        }
+    },
+    "installer": {
+        "script": [
+            "Expand-DarkArchive \"$dir\\$fname\" \"$dir\\extracted\" -Removal",
+            "Get-ChildItem \"$dir\\extracted\\AttachedContainer\\*.msi\" | ForEach-Object { Expand-MsiArchive $_ \"$dir\" }",
+            "Move-Item \"$dir\\dotnet\\*\" \"$dir\" -Force",
+            "@('dotnet', 'extracted') | ForEach-Object { Remove-Item \"$dir\\$_\" -Recurse }"
+        ]
+    },
+    "bin": "dotnet.exe",
+    "env_set": {
+        "DOTNET_ROOT": "$dir"
+    },
+    "checkver": {
+        "url": "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/releases-index.json",
+        "regex": "(?s)(?<version>[\\d.]+)[^\\d]*?(?<sdkversion>[\\d.]+)[^\\d]*?(?:current|lts)"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://dotnetcli.blob.core.windows.net/dotnet/Runtime/$version/windowsdesktop-runtime-$version-win-x64.exe"
+            },
+            "32bit": {
+                "url": "https://dotnetcli.blob.core.windows.net/dotnet/Runtime/$version/windowsdesktop-runtime-$version-win-x86.exe"
+            }
+        },
+        "hash": {
+            "url": "https://dotnetcli.blob.core.windows.net/dotnet/checksums/$version-sha.txt",
+            "mode": "extract"
+        }
+    }
+}
diff --git a/bucket/fontloadersub.json b/bucket/fontloadersub.json
@@ -3,16 +3,16 @@
     "description": "OpenType font loader for subtitles (ASS/SSA)",
     "homepage": "https://github.com/yzwduck/FontLoaderSub",
     "license": "GPL-2.0-only",
+    "notes": "Place your fonts under \"$dir\\fonts\" to persist them.",
     "url": "https://github.com/yzwduck/FontLoaderSub/releases/download/r6/FontLoaderSub-r6.7z",
     "hash": "095c4ad9472ae4a354d2c9438086248ff7097176bae029d38bd87037eed0de8d",
-    "shortcuts": [["FontLoaderSub.exe", "FontLoaderSub"]],
     "pre_install": [
         "if (!(Test-Path \"$persist_dir\\fc-subs.db\")) {",
         "    New-Item -Path \"$dir\\fc-subs.db\" -ItemType file | Out-Null",
         "}"
     ],
+    "shortcuts": [["FontLoaderSub.exe", "FontLoaderSub"]],
     "persist": ["fonts", "fc-subs.db"],
-    "notes": "Place your fonts under \"$dir\\fonts\" to persist them.",
     "checkver": {
         "url": "https://github.com/yzwduck/FontLoaderSub/releases/latest",
         "regex": "/releases/tag/(r\\d+)"

diff --git a/bucket/jetbrains-mono.json b/bucket/jetbrains-mono.json
@@ -3,10 +3,11 @@
     "description": "A typeface made for developers by JetBrains",
     "homepage": "https://github.com/JetBrains/JetBrainsMono",
     "license": "Apache-2.0",
+    "notes": "You may need to restart the system to use recently installed fonts.",
+    "depends": "sudo",
     "url": "https://github.com/JetBrains/JetBrainsMono/releases/download/v2.001/JetBrains.Mono.2.001.zip",
     "hash": "d9176856e982ca16f4ee24a1021a62b51cea43575f3c6aa1910d4cdf6b695ade",
     "extract_dir": "JetBrains Mono 2.001/ttf/Variable",
-    "depends": "sudo",
     "installer": {
         "script": [
             "$path = \"$env:localappdata\\Microsoft\\Windows\\Fonts\"",
@@ -38,6 +39,5 @@
     "autoupdate": {
         "url": "https://github.com/JetBrains/JetBrainsMono/releases/download/v$version/JetBrains.Mono.$version.zip",
         "extract_dir": "JetBrains Mono $version/ttf/Variable"
-    },
-    "notes": "You may need to restart the system to use recently installed fonts."
+    }
 }
diff --git a/bucket/listary-beta.json b/bucket/listary-beta.json
@@ -3,10 +3,10 @@
     "description": "A revolutionary search utility (beta)",
     "homepage": "https://www.listary.com/beta",
     "license": "Freeware",
+    "notes": "Your data is stored in $env:appdata\\Listary.",
     "url": "https://www.listary.com/download/beta/listary6/ListaryInstaller.exe",
     "hash": "5baf39cd63e1d07784f8614fe0ec79fbc1f5ba2f4f8a91d0f2b55b24d493a250",
     "innosetup": true,
-    "shortcuts": [["Listary.exe", "Listary"]],
     "installer": {
         "script": [
             "if (!(is_admin)) {",
@@ -33,5 +33,5 @@
             "Remove-Item \"$env:appdata\\Microsoft\\Windows\\Start Menu\\Programs\\Startup\\Listary.lnk\""
         ]
     },
-    "notes": "Your data is stored in $env:appdata\\Listary."
+    "shortcuts": [["Listary.exe", "Listary"]]
 }
diff --git a/bucket/microsoft-edge-beta.json b/bucket/microsoft-edge-beta.json
@@ -3,6 +3,7 @@
     "description": "The new Microsoft Edge browser (Beta Channel)",
     "homepage": "https://www.microsoftedgeinsider.com/",
     "license": "Freeware",
+    "notes": "Your data is stored $env:localappdata\\Microsoft\\Edge.",
     "architecture": {
         "64bit": {
             "url": "https://edge-dl.kidonng.workers.dev/https://api.shuax.com/v2/download/edge/beta/x64#/dl.7z",
@@ -22,7 +23,7 @@
     "shortcuts": [["msedge.exe", "Microsoft Edge Beta"]],
     "checkver": {
         "url": "https://scoop-services.azurewebsites.net/checkver?app=microsoftedge",
-        "jp": "$.beta.x64.version"
+        "jsonpath": "$.beta.x64.version"
     },
     "autoupdate": {
         "architecture": {
@@ -33,6 +34,5 @@
                 "url": "https://edge-dl.kidonng.workers.dev/https://api.shuax.com/v2/download/edge/beta/x86#/dl.7z"
             }
         }
-    },
-    "notes": "Your data is stored $env:localappdata\\Microsoft\\Edge."
+    }
 }
diff --git a/bucket/microsoft-edge-canary.json b/bucket/microsoft-edge-canary.json
@@ -3,6 +3,7 @@
     "description": "The new Microsoft Edge browser (Canary Channel)",
     "homepage": "https://www.microsoftedgeinsider.com/",
     "license": "Freeware",
+    "notes": "Your data is stored $env:localappdata\\Microsoft\\Edge.",
     "architecture": {
         "64bit": {
             "url": "https://edge-dl.kidonng.workers.dev/https://api.shuax.com/v2/download/edge/canary/x64#/dl.7z",
@@ -22,7 +23,7 @@
     "shortcuts": [["msedge.exe", "Microsoft Edge Canary"]],
     "checkver": {
         "url": "https://scoop-services.azurewebsites.net/checkver?app=microsoftedge",
-        "jp": "$.canary.x64.version"
+        "jsonpath": "$.canary.x64.version"
     },
     "autoupdate": {
         "architecture": {
@@ -33,6 +34,5 @@
                 "url": "https://edge-dl.kidonng.workers.dev/https://api.shuax.com/v2/download/edge/canary/x86#/dl.7z"
             }
         }
-    },
-    "notes": "Your data is stored $env:localappdata\\Microsoft\\Edge."
+    }
 }
diff --git a/bucket/microsoft-edge-dev.json b/bucket/microsoft-edge-dev.json
@@ -3,6 +3,7 @@
     "description": "The new Microsoft Edge browser (Dev Channel)",
     "homepage": "https://www.microsoftedgeinsider.com/",
     "license": "Freeware",
+    "notes": "Your data is stored $env:localappdata\\Microsoft\\Edge.",
     "architecture": {
         "64bit": {
             "url": "https://edge-dl.kidonng.workers.dev/https://api.shuax.com/v2/download/edge/dev/x64#/dl.7z",
@@ -22,7 +23,7 @@
     "shortcuts": [["msedge.exe", "Microsoft Edge Dev"]],
     "checkver": {
         "url": "https://scoop-services.azurewebsites.net/checkver?app=microsoftedge",
-        "jp": "$.dev.x64.version"
+        "jsonpath": "$.dev.x64.version"
     },
     "autoupdate": {
         "architecture": {
@@ -33,6 +34,5 @@
                 "url": "https://edge-dl.kidonng.workers.dev/https://api.shuax.com/v2/download/edge/dev/x86#/dl.7z"
             }
         }
-    },
-    "notes": "Your data is stored $env:localappdata\\Microsoft\\Edge."
+    }
 }
diff --git a/bucket/microsoft-edge.json b/bucket/microsoft-edge.json
@@ -3,6 +3,7 @@
     "description": "The new Microsoft Edge browser",
     "homepage": "https://www.microsoft.com/edge",
     "license": "Freeware",
+    "notes": "Your data is stored $env:localappdata\\Microsoft\\Edge.",
     "architecture": {
         "64bit": {
             "url": "https://edge-dl.kidonng.workers.dev/https://api.shuax.com/v2/download/edge/stable/x64#/dl.7z",
@@ -22,7 +23,7 @@
     "shortcuts": [["msedge.exe", "Microsoft Edge"]],
     "checkver": {
         "url": "https://scoop-services.azurewebsites.net/checkver?app=microsoftedge",
-        "jp": "$.stable.x64.version"
+        "jsonpath": "$.stable.x64.version"
     },
     "autoupdate": {
         "architecture": {
@@ -33,6 +34,5 @@
                 "url": "https://edge-dl.kidonng.workers.dev/https://api.shuax.com/v2/download/edge/stable/x86#/dl.7z"
             }
         }
-    },
-    "notes": "Your data is stored $env:localappdata\\Microsoft\\Edge."
+    }
 }
diff --git a/bucket/officetoolplus-beta.json b/bucket/officetoolplus-beta.json
@@ -3,9 +3,9 @@
     "description": "A tool for managing, downloading and installing Office.",
     "homepage": "https://otp.landian.vip/",
     "license": "Freeware",
+    "notes": "Please install .NET Core Desktop Runtime 3.1 (x86): https://dotnet.microsoft.com/download/dotnet-core/3.1",
     "url": "https://download.coolhub.top/Office-Tool-v8.0.zip",
     "extract_dir": "Office Tool",
     "shortcuts": [["Office Tool Plus.exe", "Office Tool Plus"]],
-    "persist": "Office",
-    "notes": "Please install .NET Core Desktop Runtime 3.1 (x86): https://dotnet.microsoft.com/download/dotnet-core/3.1"
+    "persist": "Office"
 }
diff --git a/bucket/openhashtab.json b/bucket/openhashtab.json
@@ -3,6 +3,7 @@
     "description": "A shell extension for conveniently calculating and checking file hashes from file properties",
     "homepage": "https://github.com/namazso/OpenHashTab",
     "license": "GPL-3.0-or-later",
+    "notes": "Due to Scoop's limitations, innounp is listed as a dependency though it is only required for installation.",
     "depends": "innounp",
     "url": "https://github.com/namazso/OpenHashTab/releases/download/v2.2.0/OpenHashTab_setup.exe",
     "hash": "ab2a232a3b2833ef92cae9053d39af90ced0ea19f653a9e09fe1389457adedee",
@@ -37,6 +38,5 @@
     "checkver": "github",
     "autoupdate": {
         "url": "https://github.com/namazso/OpenHashTab/releases/download/v$version/OpenHashTab_setup.exe"
-    },
-    "notes": "Due to Scoop's limitations, innounp is listed as a dependency though it is only required for installation."
+    }
 }
diff --git a/bucket/qv2ray-beta.json b/bucket/qv2ray-beta.json
@@ -36,7 +36,7 @@
     "persist": "config",
     "checkver": {
         "url": "https://github.com/Qv2ray/Qv2ray/releases",
-        "re": "/tree/v([\\w.-]+)"
+        "regex": "/tree/v([\\w.-]+)"
     },
     "autoupdate": {
         "architecture": {

diff --git a/bucket/qv2ray-plugin-command-beta.json b/bucket/qv2ray-plugin-command-beta.json
@@ -3,6 +3,7 @@
     "description": "Command plugin for Qv2ray (beta)",
     "homepage": "https://github.com/Qv2ray/QvPlugin-Command",
     "license": "GPL-3.0-or-later",
+    "depends": "sushi/qv2ray-beta",
     "architecture": {
         "64bit": {
             "url": "https://github.com/Qv2ray/QvPlugin-Command/releases/download/v2.0.0/QvCommandPlugin.v2.0.0.Windows-x64.dll",
@@ -13,7 +14,6 @@
             "hash": "43d6c1ff77afc86e9919fe0d8bdc48f43e28b45a37e12b2fa541bac80f1ff9d0"
         }
     },
-    "depends": "sushi/qv2ray-beta",
     "installer": {
         "script": [
             "function LinkFile([String] $file, [String] $source = $file) {",
@@ -28,7 +28,7 @@
     },
     "checkver": {
         "url": "https://github.com/Qv2ray/QvPlugin-Command/releases",
-        "re": "/tree/v([\\w.-]+)"
+        "regex": "/tree/v([\\w.-]+)"
     },
     "autoupdate": {
         "architecture": {

diff --git a/bucket/qv2ray-plugin-command.json b/bucket/qv2ray-plugin-command.json
@@ -3,6 +3,7 @@
     "description": "Command plugin for Qv2ray",
     "homepage": "https://github.com/Qv2ray/QvPlugin-Command",
     "license": "GPL-3.0-or-later",
+    "depends": "extras/qv2ray",
     "architecture": {
         "64bit": {
             "url": "https://github.com/Qv2ray/QvPlugin-Command/releases/download/v2.0.0/QvCommandPlugin.v2.0.0.Windows-x64.dll",
@@ -13,7 +14,6 @@
             "hash": "43d6c1ff77afc86e9919fe0d8bdc48f43e28b45a37e12b2fa541bac80f1ff9d0"
         }
     },
-    "depends": "extras/qv2ray",
     "installer": {
         "script": [
             "function LinkFile([String] $file, [String] $source = $file) {",

diff --git a/bucket/qv2ray-plugin-naiveproxy.json b/bucket/qv2ray-plugin-naiveproxy.json
@@ -3,6 +3,7 @@
     "description": "NaiveProxy plugin for Qv2ray",
     "homepage": "https://github.com/Qv2ray/QvPlugin-NaiveProxy",
     "license": "GPL-3.0-or-later",
+    "depends": ["extras/qv2ray", "naiveproxy"],
     "architecture": {
         "64bit": {
             "url": "https://github.com/Qv2ray/QvPlugin-NaiveProxy/releases/download/v0.1.0-rc3/QvPlugin-NaiveProxy.v0.1.0-rc3.Windows-x64.dll",
@@ -13,7 +14,6 @@
             "hash": "ecbc17f404f33963966d1bfde445d177e0426d887eb9512c05a8d91d90b4e2dc"
         }
     },
-    "depends": ["extras/qv2ray", "naiveproxy"],
     "installer": {
         "script": [
             "function LinkFile([String] $file, [String] $source = $file) {",
@@ -34,7 +34,7 @@
     },
     "checkver": {
         "url": "https://github.com/Qv2ray/QvPlugin-NaiveProxy/releases",
-        "re": "/tree/v([\\w.-]+)"
+        "regex": "/tree/v([\\w.-]+)"
     },
     "autoupdate": {
         "architecture": {

diff --git a/bucket/qv2ray-plugin-ssr-beta.json b/bucket/qv2ray-plugin-ssr-beta.json
@@ -3,6 +3,7 @@
     "description": "ShadowSocksR plugin for Qv2ray (beta)",
     "homepage": "https://github.com/Qv2ray/QvPlugin-SSR",
     "license": "GPL-3.0-or-later",
+    "depends": "sushi/qv2ray-beta",
     "architecture": {
         "64bit": {
             "url": "https://github.com/Qv2ray/QvPlugin-SSR/releases/download/v2.0.0/QvSSRPlugin.v2.0.0.Windows-x64.dll",
@@ -13,7 +14,6 @@
             "hash": "63fd019c9eadbfe171d96b46922bc5b04d689e6a971574155435efea5a2ba452"
         }
     },
-    "depends": "sushi/qv2ray-beta",
     "installer": {
         "script": [
             "function LinkFile([String] $file, [String] $source = $file) {",
@@ -28,7 +28,7 @@
     },
     "checkver": {
         "url": "https://github.com/Qv2ray/QvPlugin-SSR/releases",
-        "re": "/tree/v([\\w.-]+)"
+        "regex": "/tree/v([\\w.-]+)"
     },
     "autoupdate": {
         "architecture": {

diff --git a/bucket/qv2ray-plugin-ssr.json b/bucket/qv2ray-plugin-ssr.json
@@ -3,6 +3,7 @@
     "description": "ShadowSocksR plugin for Qv2ray",
     "homepage": "https://github.com/Qv2ray/QvPlugin-SSR",
     "license": "GPL-3.0-or-later",
+    "depends": "extras/qv2ray",
     "architecture": {
         "64bit": {
             "url": "https://github.com/Qv2ray/QvPlugin-SSR/releases/download/v2.0.0/QvSSRPlugin.v2.0.0.Windows-x64.dll",
@@ -13,7 +14,6 @@
             "hash": "63fd019c9eadbfe171d96b46922bc5b04d689e6a971574155435efea5a2ba452"
         }
     },
-    "depends": "extras/qv2ray",
     "installer": {
         "script": [
             "function LinkFile([String] $file, [String] $source = $file) {",