🐛 Compatible with downloading and using actions.

This commit is contained in:
Tw93
2023-07-21 09:23:55 +08:00
parent e314842482
commit 0a607f509a
5 changed files with 8 additions and 6 deletions

View File

@@ -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
1 name(Linux) name(Mac/Windows) name_zh url
2 programmusic ProgramMusic ProgramMusic https://musicforprogramming.net/
3 twitter Twitter 推特 https://twitter.com/
4 youtube YouTube YouTube https://youtube.com https://www.youtube.com
5 reference Reference Reference https://quickref.me/zh-CN/
6 coderunner CodeRunner CodeRunner https://riju.codes/
7 chatgpt ChatGPT ChatGPT https://chat.openai.com/chat

3
bin/helpers/rust.ts vendored
View File

@@ -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';

5
dist/cli.js vendored
View File

@@ -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';

View File

@@ -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"

View File

@@ -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"