diff --git a/app.csv b/app.csv index a2ff863..ee95b96 100644 --- a/app.csv +++ b/app.csv @@ -1,7 +1,7 @@ name(Linux),name(Mac/Windows),name_zh,url programmusic,ProgramMusic,ProgramMusic,https://musicforprogramming.net/ twitter,Twitter,ๆŽจ็‰น,https://twitter.com/ -youtube,YouTube,YouTube,https://youtube.com +youtube,YouTube,YouTube,https://www.youtube.com reference,Reference,Reference,https://quickref.me/zh-CN/ coderunner,CodeRunner,CodeRunner,https://riju.codes/ chatgpt,ChatGPT,ChatGPT,https://chat.openai.com/chat diff --git a/bin/helpers/rust.ts b/bin/helpers/rust.ts index bf53087..a6e74a9 100644 --- a/bin/helpers/rust.ts +++ b/bin/helpers/rust.ts @@ -7,8 +7,9 @@ import { shellExec } from '@/utils/shell'; import { isChinaDomain } from '@/utils/ip'; export async function installRust() { + const isActions = process.env.GITHUB_ACTIONS; const isInChina = await isChinaDomain('sh.rustup.rs'); - const rustInstallScriptForMac = isInChina + const rustInstallScriptForMac = isInChina && !isActions ? 'export RUSTUP_DIST_SERVER="https://rsproxy.cn" && export RUSTUP_UPDATE_ROOT="https://rsproxy.cn/rustup" && curl --proto "=https" --tlsv1.2 -sSf https://rsproxy.cn/rustup-init.sh | sh' : "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y"; const rustInstallScriptForWindows = 'winget install --id Rustlang.Rustup'; diff --git a/dist/cli.js b/dist/cli.js index e35433e..81e7672 100644 --- a/dist/cli.js +++ b/dist/cli.js @@ -20,7 +20,7 @@ import isUrl from 'is-url'; import fs from 'fs'; var name = "pake-cli"; -var version = "2.2.0"; +var version = "2.2.1"; var description = "๐Ÿคฑ๐Ÿป Turn any webpage into a desktop app with Rust. ๐Ÿคฑ๐Ÿป ๅพˆ็ฎ€ๅ•็š„็”จ Rust ๆ‰“ๅŒ…็ฝ‘้กต็”Ÿๆˆๅพˆๅฐ็š„ๆกŒ้ข Appใ€‚"; var engines = { node: ">=16.0.0" @@ -436,8 +436,9 @@ async function isChinaIP(ip, domain) { } async function installRust() { + const isActions = process.env.GITHUB_ACTIONS; const isInChina = await isChinaDomain('sh.rustup.rs'); - const rustInstallScriptForMac = isInChina + const rustInstallScriptForMac = isInChina && !isActions ? 'export RUSTUP_DIST_SERVER="https://rsproxy.cn" && export RUSTUP_UPDATE_ROOT="https://rsproxy.cn/rustup" && curl --proto "=https" --tlsv1.2 -sSf https://rsproxy.cn/rustup-init.sh | sh' : "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y"; const rustInstallScriptForWindows = 'winget install --id Rustlang.Rustup'; diff --git a/package.json b/package.json index 67b1527..ad28ea3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pake-cli", - "version": "2.2.0", + "version": "2.2.1", "description": "๐Ÿคฑ๐Ÿป Turn any webpage into a desktop app with Rust. ๐Ÿคฑ๐Ÿป ๅพˆ็ฎ€ๅ•็š„็”จ Rust ๆ‰“ๅŒ…็ฝ‘้กต็”Ÿๆˆๅพˆๅฐ็š„ๆกŒ้ข Appใ€‚", "engines": { "node": ">=16.0.0" diff --git a/src-tauri/rust_proxy.toml b/src-tauri/rust_proxy.toml index dbd564d..eee0c01 100644 --- a/src-tauri/rust_proxy.toml +++ b/src-tauri/rust_proxy.toml @@ -1,6 +1,6 @@ [source.crates-io] # To use sparse index, change 'rsproxy' to 'rsproxy-sparse' -replace-with = 'rsproxy' +replace-with = 'rsproxy-sparse' [source.rsproxy] registry = "https://rsproxy.cn/crates.io-index"