From b42498d1881f8963c27758084617eca1f7fed5af Mon Sep 17 00:00:00 2001 From: arabian Date: Thu, 25 Sep 2025 18:48:19 +0300 Subject: [PATCH] remove build_rpm.sh and cargo-generate-rpm mentions. Now copr handles rpm builds --- Cargo.toml | 10 ---------- scripts/build_all.sh | 2 -- scripts/build_rpm.sh | 8 -------- 3 files changed, 20 deletions(-) delete mode 100755 scripts/build_rpm.sh diff --git a/Cargo.toml b/Cargo.toml index f4ee00d..68c1dd7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,16 +49,6 @@ codegen-units = 1 opt-level = "z" panic = "abort" -[package.metadata.generate-rpm] -assets = [ - { source = "target/release/pwsp-daemon", dest = "/usr/bin/pwsp-daemon", mode = "755" }, - { source = "target/release/pwsp-cli", dest = "/usr/bin/pwsp-cli", mode = "755" }, - { source = "target/release/pwsp-gui", dest = "/usr/bin/pwsp-gui", mode = "755" }, - { source = "assets/pwsp-gui.desktop", dest = "/usr/share/applications/pwsp.desktop", mode = "644" }, - { source = "assets/icon.png", dest = "/usr/share/icons/hicolor/256x256/apps/pwsp.png", mode = "644" }, - { source = "assets/pwsp-daemon.service", dest = "/usr/lib/systemd/user/pwsp-daemon.service", mode = "644" }, -] - [package.metadata.deb] assets = [ ["target/release/pwsp-daemon", "usr/bin/", "755"], diff --git a/scripts/build_all.sh b/scripts/build_all.sh index dd335fa..56e4e81 100755 --- a/scripts/build_all.sh +++ b/scripts/build_all.sh @@ -4,7 +4,6 @@ cd "$(dirname "$(realpath "$0")")/.." || exit bash ./scripts/build.sh -bash ./scripts/build_rpm.sh bash ./scripts/build_deb.sh if command -v upx >/dev/null 2>&1; then @@ -20,5 +19,4 @@ rm -rf ./target/for_github_release mkdir ./target/for_github_release cp "$(find ./target/debian/pwsp_*_amd64.deb | sort -V | tail -n 1)" ./target/for_github_release/ -cp "$(find ./target/generate-rpm/pwsp-*.x86_64.rpm | sort -V | tail -n 1)" ./target/for_github_release/ zip -9j ./target/for_github_release/pwsp-x86_64-linux.zip ./target/release/pwsp-gui ./target/release/pwsp-cli ./target/release/pwsp-daemon \ No newline at end of file diff --git a/scripts/build_rpm.sh b/scripts/build_rpm.sh deleted file mode 100755 index 28b03b9..0000000 --- a/scripts/build_rpm.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -cd "$(dirname "$(realpath "$0")")/.." || exit - -rm -rf ./target/cargo-generate-rpm - -cargo install cargo-generate-rpm -cargo-generate-rpm \ No newline at end of file