🚑 修复macos和linux运行出错

Author: freeok

.github/workflows/release.yml

@@ -25,9 +25,10 @@ jobs:
       - name: Build executable
         shell: powershell
         run: |
-          sh bin/deploy-windows.sh
-          sh bin/deploy-macos.sh
-          sh bin/deploy-linux.sh
+          bash bin/release-windows.sh
+          bash bin/release-linux.sh
+          bash bin/release-macos.sh
+          bash bin/release-macos.sh x64
 
       - name: Create Release
         uses: ncipollo/release-action@v1

bin/deploy-macos.sh

@@ -1,47 +1,48 @@
 #!/bin/bash
-# ====================================================
+set -e
+
+# Linux 发布脚本 (x86_64)
 # JDK 升级后需要修改下面 2 个版本号
-# ====================================================
 
-# JRE 压缩文件名
+# JRE 文件
 jre_filename="jre-17.0.12+7_linux.tar.gz"
-# JRE 解压后的目录名
 jre_dirname="jdk-17.0.12+7-jre"
 
-# 最终产物的压缩文件名
+# 最终产物
 dist_filename="sonovel-linux.tar.gz"
-# 解压后的目录名
-dist_dirname="SoNovel-Linux"
+dist_dirname="SoNovel-linux"
 
+# 项目根路径
 project_path=$(
   cd "$(dirname "$0")" || exit
   cd ..
   pwd
 )
 cd "$project_path" || exit
 
-mvn clean package -Dmaven.test.skip=true -DjrePath=runtime
+# Maven 打包
+mvn clean package -Plinux-x86_64 -Dmaven.test.skip=true -DjrePath=runtime
+
+# 创建产物目录
 mkdir -p dist
-mkdir "target/$dist_dirname"
+mkdir -p "target/$dist_dirname"
 
-# 复制配置文件、使用说明、启动脚本、JRE
-cp config.ini bundle/readme.txt bundle/linux-run.sh "bundle/$jre_filename" "target/$dist_dirname"
+# 复制配置、说明、字体、JRE
+cp config.ini bundle/readme.txt bundle/run-linux.sh "bundle/$jre_filename" "target/$dist_dirname"
 cp -r bundle/fonts "target/$dist_dirname"
 
 cd target
-# 重命名
 mv app-jar-with-dependencies.jar app.jar
 cp app.jar "$dist_dirname"
 
+# 解压 JRE 并改名
 cd "$dist_dirname"
-# 解压
 tar zxf "$jre_filename" && rm "$jre_filename"
-# 重命名
 mv "$jre_dirname" runtime
 cd ..
-# 压缩
+
+# 打包压缩
 tar czf "$dist_filename" "$dist_dirname"
-# 剪切
 mv "$dist_filename" $project_path/dist
 
 echo Linux done!

bin/deploy-windows.sh

@@ -0,0 +1,66 @@
+#!/bin/bash
+set -e
+
+# macOS 发布脚本 (arm64, x64)
+# JDK 升级后需要修改下面 3 个版本号
+
+# JRE 文件名
+jre_filename_arm64="jre-17.0.11+9-arm64_mac.tar.gz"
+jre_filename_x64="jre-17.0.11+9-x64_mac.tar.gz"
+# JRE 解压后的目录名
+jre_dirname="jdk-17.0.11+9-jre"
+
+# 最终产物名
+dist_filename_arm64="sonovel-macos_arm64.tar.gz"
+dist_dirname_arm64="SoNovel-macOS_arm64"
+dist_filename_x64="sonovel-macos_x64.tar.gz"
+dist_dirname_x64="SoNovel-macOS_x64"
+
+# 自动定位项目根目录
+project_path=$(cd "$(dirname "$0")" || exit; cd ..; pwd)
+cd "$project_path" || exit
+
+# 读取架构参数
+arch="$1"
+if [[ "$arch" == "x64" ]]; then
+  profile="macos-x86_64"
+  jre_filename="$jre_filename_x64"
+  dist_filename="$dist_filename_x64"
+  dist_dirname="$dist_dirname_x64"
+else
+  arch="arm64" # 默认
+  profile="macos-arm64"
+  jre_filename="$jre_filename_arm64"
+  dist_filename="$dist_filename_arm64"
+  dist_dirname="$dist_dirname_arm64"
+fi
+
+echo "👉 打包 macOS [$arch]..."
+
+# Maven 打包
+mvn clean package -Dmaven.test.skip=true -P$profile -DjrePath=runtime
+
+# 准备目录
+mkdir -p dist
+mkdir -p "target/$dist_dirname"
+
+# 复制配置文件、说明、脚本、字体
+cp config.ini bundle/readme.txt bundle/run-macos.sh "bundle/$jre_filename" "target/$dist_dirname"
+cp -r bundle/fonts "target/$dist_dirname"
+
+# 复制 jar
+cd target
+mv app-jar-with-dependencies.jar app.jar || true  # 忽略已改名的情况
+cp app.jar "$dist_dirname"
+
+# 解压 JRE
+cd "$dist_dirname"
+tar zxf "$jre_filename" && rm "$jre_filename"
+mv "$jre_dirname" runtime
+cd ..
+
+# 打包 tar.gz
+tar czf "$dist_filename" "$dist_dirname"
+mv "$dist_filename" "$project_path/dist"
+
+echo "✅ macOS [$arch] 打包完成！输出: dist/$dist_filename"

bin/deploy-linux.sh bin/release-linux.shbin/deploy-linux.sh renamed to bin/release-linux.sh

@@ -0,0 +1,55 @@
+#!/bin/bash
+set -e  # 出现错误立即退出
+
+# launch4j-maven-plugin 仅支持 windows，mvn package 触发
+# Windows 发布脚本 (x86_64)
+# JDK 升级后需要修改下面 2 个版本号
+
+# 配置部分
+jre_filename="jre-17.0.11+9-x64_windows.tar.gz"
+jre_dirname="jdk-17.0.11+9-jre"
+dist_filename="sonovel-windows.tar.gz"
+
+# 获取项目根目录
+project_path="$( cd "$(dirname "$0")"/.. && pwd )"
+dist_path="$project_path/dist"
+target_dir="$project_path/target/SoNovel"
+
+prepare_dist_dir() {
+    mkdir -p "$dist_path"
+}
+
+run_maven() {
+    mvn clean package -Pwindows-x86_64 -Dmaven.test.skip=true -DjrePath=runtime -Denv=prod
+}
+
+copy_files() {
+    cp config.ini bundle/SoNovel.l4j.ini bundle/readme.txt "$target_dir"
+    cp -r bundle/fonts "$target_dir/"
+    cp "bundle/$jre_filename" "$target_dir"
+}
+
+extract_jre() {
+    cd "$target_dir"
+    tar zxf "$jre_filename"
+    rm "$jre_filename"
+    mv "$jre_dirname" runtime
+}
+
+package_artifacts() {
+    cd "$project_path/target"
+    tar czf "$dist_filename" SoNovel
+    mv "$dist_filename" "$dist_path"
+}
+
+main() {
+    cd "$project_path"
+    prepare_dist_dir
+    run_maven
+    copy_files
+    extract_jre
+    package_artifacts
+    echo "Windows done!"
+}
+
+main

bin/release-macos.sh

@@ -2,10 +2,10 @@ Windows 用户
 运行 SoNovel.exe
 
 macOS 用户
-运行 macos-run.sh
+运行 run-macos.sh
 
 Linux 用户
-运行 linux-run.sh
+运行 run-linux.sh
 
 
 必看！书源信息