From 9c5b51adc9814bc54df9c838f643f59d1bd36e6f Mon Sep 17 00:00:00 2001 From: Tlntin Date: Mon, 16 Jan 2023 21:41:50 +0800 Subject: [PATCH] Fix the regular expression with errors during batch packaging in pake-cli --- script/build.sh | 10 +++++----- src-tauri/tauri.conf.json | 30 ------------------------------ 2 files changed, 5 insertions(+), 35 deletions(-) delete mode 100644 src-tauri/tauri.conf.json diff --git a/script/build.sh b/script/build.sh index e2421c2..242c8f9 100755 --- a/script/build.sh +++ b/script/build.sh @@ -67,7 +67,7 @@ do url=${arr[3]} # replace package info $sd -s "${old_url}" "${url}" src-tauri/tauri.conf.json - $sd "${old_name}" "${package_name}" src-tauri/tauri.conf.json + $sd -s "${old_name}" "${package_name}" src-tauri/tauri.conf.json # echo "update ico with 32x32 pictue" # $sd "${old_name}" "${package_name}" src-tauri/src/main.rs @@ -82,8 +82,8 @@ do echo "warning" cp "src-tauri/icons/icon.icns" "src-tauri/icons/${package_name}.icns" fi - $sd "${old_name}" "${package_name}" src-tauri/tauri.macos.conf.json - $sd "${old_title}" "${package_title}" src-tauri/tauri.conf.json + $sd -s "${old_name}" "${package_name}" src-tauri/tauri.macos.conf.json + $sd -s "${old_title}" "${package_title}" src-tauri/tauri.conf.json fi # echo "update ico with 32x32 pictue" @@ -105,8 +105,8 @@ do old_desktop="src-tauri/assets/${package_prefix}-${old_name}.desktop" new_desktop="src-tauri/assets/${package_prefix}-${package_name}.desktop" mv "${old_desktop}" "${new_desktop}" - $sd "${old_zh_name}" "${package_zh_name}" "${new_desktop}" - $sd "${old_name}" "${package_name}" "${new_desktop}" + $sd -s "${old_zh_name}" "${package_zh_name}" "${new_desktop}" + $sd -s "${old_name}" "${package_name}" "${new_desktop}" fi # update package info diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json deleted file mode 100644 index bd260ec..0000000 --- a/src-tauri/tauri.conf.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "package": { - "productName": "WeRead", - "version": "1.0.0" - }, - "tauri": { - "windows": [ - { - "url": "https://weread.qq.com/", - "transparent": true, - "fullscreen": false, - "width": 1200, - "height": 780, - "resizable": true - } - ], - "security": { - "csp": null - }, - "updater": { - "active": false - } - }, - "build": { - "devPath": "../dist", - "distDir": "../dist", - "beforeBuildCommand": "", - "beforeDevCommand": "" - } -}