yuqianhe/airdisplay-desktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: use npx instead of npm run for tauri CLI to fix argument passing

Browse Source
This commit is contained in:
于千贺
2026-05-31 13:43:09 +08:00
parent 1e0ba958df
commit 301437482d
1 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
build.sh
View File

@@ -272,13 +272,13 @@ build_macos_universal() {
check_rust_target "x86_64-apple-darwin" check_rust_target "x86_64-apple-darwin"
check_rust_target "aarch64-apple-darwin" check_rust_target "aarch64-apple-darwin"
local tauri_args=(tauri build --target universal-apple-darwin) local cmd=(npx tauri build --target universal-apple-darwin)
if [[ "$BUILD_TYPE" == "debug" ]]; then if [[ "$BUILD_TYPE" == "debug" ]]; then
tauri_args=(tauri build --target universal-apple-darwin --debug) cmd=(npx tauri build --target universal-apple-darwin --debug)
fi fi
info "Running: npm run ${tauri_args[*]}" info "Running: ${cmd[*]}"
npm run "${tauri_args[@]}" "${cmd[@]}"
} }
build_platform() { build_platform() {
@@ -302,17 +302,17 @@ build_platform() {
if [[ "$toolchain" == "native" ]]; then if [[ "$toolchain" == "native" ]]; then
check_rust_target "$rust_target" check_rust_target "$rust_target"
local tauri_args=(tauri build --target "$rust_target") local cmd=(npx tauri build --target "$rust_target")
if [[ "$BUILD_TYPE" == "debug" ]]; then if [[ "$BUILD_TYPE" == "debug" ]]; then
tauri_args+=(--debug) cmd+=(--debug)
fi fi
case "$platform" in case "$platform" in
macos) tauri_args+=(--bundles app) ;; macos) cmd+=(--bundles app) ;;
windows) tauri_args+=(--bundles nsis) ;; windows) cmd+=(--bundles nsis) ;;
linux) tauri_args+=(--bundles deb) ;; linux) cmd+=(--bundles deb) ;;
esac esac
info "Running: npm run ${tauri_args[*]}" info "Running: ${cmd[*]}"
npm run "${tauri_args[@]}" "${cmd[@]}"
elif [[ "$toolchain" == "cross" ]]; then elif [[ "$toolchain" == "cross" ]]; then
install_cross_tools "cross" install_cross_tools "cross"
check_rust_target "$rust_target" check_rust_target "$rust_target"
@@ -322,16 +322,16 @@ build_platform() {
build_flag="--release" build_flag="--release"
fi fi
(cd src-tauri && cross build --target "$rust_target" $build_flag --lib) (cd src-tauri && cross build --target "$rust_target" $build_flag --lib)
local tauri_args=(tauri build --target "$rust_target") local cmd=(npx tauri build --target "$rust_target")
if [[ "$BUILD_TYPE" == "debug" ]]; then if [[ "$BUILD_TYPE" == "debug" ]]; then
tauri_args+=(--debug) cmd+=(--debug)
fi fi
case "$platform" in case "$platform" in
windows) tauri_args+=(--bundles nsis) ;; windows) cmd+=(--bundles nsis) ;;
linux) tauri_args+=(--bundles deb) ;; linux) cmd+=(--bundles deb) ;;
esac esac
info "Running: npm run ${tauri_args[*]}" info "Running: ${cmd[*]}"
npm run "${tauri_args[@]}" "${cmd[@]}"
elif [[ "$toolchain" == "xwin" ]]; then elif [[ "$toolchain" == "xwin" ]]; then
install_cross_tools "xwin" install_cross_tools "xwin"
check_rust_target "$rust_target" check_rust_target "$rust_target"
@@ -341,12 +341,12 @@ build_platform() {
build_flag="--release" build_flag="--release"
fi fi
(cd src-tauri && cargo xwin build --target "$rust_target" $build_flag) (cd src-tauri && cargo xwin build --target "$rust_target" $build_flag)
local tauri_args=(tauri build --target "$rust_target" --bundles nsis) local cmd=(npx tauri build --target "$rust_target" --bundles nsis)
if [[ "$BUILD_TYPE" == "debug" ]]; then if [[ "$BUILD_TYPE" == "debug" ]]; then
tauri_args+=(--debug) cmd+=(--debug)
fi fi
info "Running: npm run ${tauri_args[*]}" info "Running: ${cmd[*]}"
npm run "${tauri_args[@]}" "${cmd[@]}"
elif [[ "$toolchain" == "zigbuild" ]]; then elif [[ "$toolchain" == "zigbuild" ]]; then
install_cross_tools "zigbuild" install_cross_tools "zigbuild"
check_rust_target "$rust_target" check_rust_target "$rust_target"
@@ -356,15 +356,15 @@ build_platform() {
build_flag="--release" build_flag="--release"
fi fi
(cd src-tauri && cargo zigbuild --target "$rust_target" $build_flag) (cd src-tauri && cargo zigbuild --target "$rust_target" $build_flag)
local tauri_args=(tauri build --target "$rust_target") local cmd=(npx tauri build --target "$rust_target")
if [[ "$BUILD_TYPE" == "debug" ]]; then if [[ "$BUILD_TYPE" == "debug" ]]; then
tauri_args+=(--debug) cmd+=(--debug)
fi fi
case "$platform" in case "$platform" in
linux) tauri_args+=(--bundles deb) ;; linux) cmd+=(--bundles deb) ;;
esac esac
info "Running: npm run ${tauri_args[*]}" info "Running: ${cmd[*]}"
npm run "${tauri_args[@]}" "${cmd[@]}"
else else
error "Unknown toolchain: $toolchain" error "Unknown toolchain: $toolchain"
fi fi