pake-cli 2.2.0 → 2.2.4

package/README.md

@@ -107,7 +107,7 @@
     </tr>
     <tr>
         <td><img src=https://cdn.fliggy.com/upic/i2eg6G.png width=600/></td>
-        <td><img src=https://cdn.fliggy.com/upic/fS1lVi.jpg width=600/></td>
+        <td><img src=https://cdn.fliggy.com/upic/mUzOek.jpg width=600/></td>
     </tr>
         <tr>
         <td>Flomo

package/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.4";
 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';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pake-cli",
-  "version": "2.2.0",
+  "version": "2.2.4",
   "description": "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 很简单的用 Rust 打包网页生成很小的桌面 App。",
   "engines": {
     "node": ">=16.0.0"

package/src-tauri/src/app/invoke.rs

@@ -1,8 +1,8 @@
-use crate::util::{check_file_or_append, get_download_message, MessageType, show_toast};
-use tauri::{api, command, AppHandle, Manager, Window};
-use tauri::api::http::{ClientBuilder, HttpRequestBuilder, ResponseType};
+use crate::util::{check_file_or_append, get_download_message, show_toast, MessageType};
 use std::fs::File;
 use std::io::Write;
+use tauri::api::http::{ClientBuilder, HttpRequestBuilder, ResponseType};
+use tauri::{api, command, AppHandle, Manager, Window};
 
 #[derive(serde::Deserialize)]
 pub struct DownloadFileParams {
@@ -19,11 +19,13 @@ pub async fn download_file(app: AppHandle, params: DownloadFileParams) -> Result
     let file_path = check_file_or_append(output_path.to_str().unwrap());
     let client = ClientBuilder::new().build().unwrap();
 
-    let response = client.send(
-        HttpRequestBuilder::new("GET", &params.url)
-            .unwrap()
-            .response_type(ResponseType::Binary)
-    ).await;
+    let response = client
+        .send(
+            HttpRequestBuilder::new("GET", &params.url)
+                .unwrap()
+                .response_type(ResponseType::Binary),
+        )
+        .await;
 
     match response {
         Ok(res) => {

package/src-tauri/tauri.linux.conf.json

@@ -8,9 +8,7 @@
       "copyright": "",
       "deb": {
         "depends": ["curl", "wget"],
-        "files": {
-          "/usr/share/applications/com-pake-weread.desktop": "assets/com-pake-weread.desktop"
-        }
+        "files": {"/usr/share/applications/com-pake-weread.desktop": "assets/com-pake-weread.desktop"}
       },
       "externalBin": [],
       "longDescription": "",