fix dependency check, put binaries in sbin

DefGuard · Jan 12, 2025 · ff694f0 · ff694f0
1 parent 647f5d0
commit ff694f0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -185,7 +185,7 @@ jobs:
       - name: Build dg deb
         uses: defGuard/fpm-action@main
         with:
-          fpm_args: 'dg-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}=/usr/bin/dg dg.service=/usr/lib/systemd/system/dg.service src-tauri/cli/.env=/etc/defguard/dg.conf'
+          fpm_args: 'dg-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}=/usr/sbin/dg dg.service=/usr/lib/systemd/system/dg.service src-tauri/cli/.env=/etc/defguard/dg.conf'
           fpm_opts: '--architecture ${{ matrix.binary_arch }} --debug --output-type deb --version ${{ env.VERSION }} --package dg-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}.deb'
       - name: Upload DEB
         uses: actions/[email protected]
@@ -199,7 +199,7 @@ jobs:
       - name: Build dg rpm
         uses: defGuard/fpm-action@main
         with:
-          fpm_args: 'dg-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}=/usr/bin/dg dg.service=/usr/lib/systemd/system/dg.service src-tauri/cli/.env=/etc/defguard/dg.conf'
+          fpm_args: 'dg-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}=/usr/sbin/dg dg.service=/usr/lib/systemd/system/dg.service src-tauri/cli/.env=/etc/defguard/dg.conf'
           fpm_opts: '--architecture ${{ matrix.binary_arch }} --debug --output-type rpm --version ${{ env.VERSION }} --package dg-linux-${{ matrix.binary_arch }}-${{ github.ref_name }}.rpm'
       - name: Upload RPM
         uses: actions/[email protected]

diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -38,7 +38,7 @@ clap = { version = "4.5", features = ["cargo", "derive", "env"] }
 chrono = { version = "0.4", features = ["serde"] }
 common = { path = "common" }
 dark-light = "1.1"
-defguard_wireguard_rs = { workspace = true }
+defguard_wireguard_rs = { workspace = true, features = ["check_dependencies"] }
 dirs-next = "2.0"
 lazy_static = "1.5"
 log = { version = "0.4", features = ["serde"] }

diff --git a/src-tauri/cli/Cargo.toml b/src-tauri/cli/Cargo.toml
@@ -13,7 +13,7 @@ prost-build = "0.13"
 [dependencies]
 clap = { version = "4.5", features = ["cargo", "derive", "env"] }
 common = { path = "../common" }
-defguard_wireguard_rs = { workspace = true }
+defguard_wireguard_rs = { workspace = true, features = ["check_dependencies"] }
 dirs-next = "2.0"
 prost = "0.13"
 reqwest = { version = "0.12", features = ["cookies", "json"] }