Skip to content

Commit dbb2f76

Browse files
committed
🔧 Tweak kwin version detection
1 parent 548d92e commit dbb2f76

1 file changed

Lines changed: 3 additions & 14 deletions

File tree

.github/workflows/deploy.yml

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,26 +49,15 @@ jobs:
4949
shell: bash
5050
run: |
5151
VERSION="unknown"
52-
CANDIDATE=""
5352
5453
# Ubuntu / Debian containers
5554
if command -v dpkg-query >/dev/null 2>&1; then
56-
for PACKAGE in kwin-x11 kwin-dev; do
57-
if CANDIDATE="$(dpkg-query -W -f='${Version}' "$PACKAGE" 2>/dev/null)"; then
58-
VERSION="$CANDIDATE"
59-
break
60-
fi
61-
done
55+
VERSION="$(dpkg-query -W -f='${Version}' kwin-dev 2>/dev/null || echo unknown)"
6256
fi
6357
6458
# Fedora / RPM containers
6559
if [[ "$VERSION" == "unknown" ]] && command -v rpm >/dev/null 2>&1; then
66-
for PACKAGE in kwin kwin-devel kwin-libs; do
67-
if CANDIDATE="$(rpm -q --qf '%{VERSION}' "$PACKAGE" 2>/dev/null)"; then
68-
VERSION="$CANDIDATE"
69-
break
70-
fi
71-
done
60+
VERSION="$(rpm -q --qf '%{VERSION}' kwin-devel 2>/dev/null || echo unknown)"
7261
fi
7362
7463
VERSION="${VERSION%%-*}"
@@ -84,7 +73,7 @@ jobs:
8473
else
8574
ARCH_SUFFIX="x86"
8675
fi
87-
ASSET_NAME="kandointegration-${{ matrix.target.distro }}-${{ matrix.target.version }}-kwin-${{ steps.kwin_version.outputs.version }}-${ARCH_SUFFIX}.zip"
76+
ASSET_NAME="${{ matrix.target.distro }}-${{ matrix.target.version }}-kwin-${{ steps.kwin_version.outputs.version }}-${ARCH_SUFFIX}.zip"
8877
mkdir -p build/release-asset
8978
cp build/bin/kwin/effects/plugins/kandointegration.so build/release-asset/kandointegration.so
9079
(

0 commit comments

Comments
 (0)