fix: use split package, add installation tests for tshark detection a…

…nd mime handler registration

packaging/aur/Dockerfile

@@ -2,9 +2,9 @@ FROM archlinux:base-devel
 
 RUN useradd -m build && \
     pacman -Syu --noconfirm && \
-    pacman -Sy --noconfirm git && \
+    pacman -Sy --noconfirm git xdg-utils && \
     echo "build ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/build
 USER build
 WORKDIR /pkg
-COPY packagebuild.sh /
+COPY packagebuildandtest.sh /
 CMD ["/bin/bash", "packagebuildandtest.sh"]

packaging/aur/PKGBUILD

@@ -7,14 +7,14 @@
 # Wireshark:
 # - https://gitlab.archlinux.org/archlinux/packaging/packages/wireshark/-/blob/main/PKGBUILD?ref_type=heads
 
-pkgname='cshargextcap'
+pkgbase='cshargextcap'
+pkgname=('cshargextcap-cli' 'cshargextcap-desktop')
 pkgver='0.9.2'
 pkgrel=1
 pkgdesc='Wireshark extcap plugin for container traffic capture live streaming'
 url='https://github.com/siemens/cshargextcap'
 arch=('x86_64')
 license=('MIT')
-depends=('wireshark-cli')
 makedepends=('go')
 source=("https://github.com/siemens/cshargextcap/archive/refs/tags/v${pkgver}.tar.gz")
 
@@ -36,8 +36,17 @@ build() {
         ./cmd/cshargextcap
 }
 
-package() {
+package_cshargextcap-cli() {
+    depends=('wireshark-cli')
+
     cd "${pkgbase}-${pkgver}"
-    install -Dm 755 build/cshargextcap "${pkgdir}"/usr/lib/wireshark/extcap/cshargextcap    
-    install -Dm 644 packaging/linux/com.github.siemens.packetflix.desktop "${pkgdir}"/usr/sahre/applications
+    install -Dm 755 build/cshargextcap -t "${pkgdir}"/usr/lib/wireshark/extcap    
+}
+
+package_cshargextcap-desktop() {
+    pkgdesk+=" - desktop integration"
+    depends=('cshargextcap-cli' 'wireshark-qt')
+
+    cd "${pkgbase}-${pkgver}"
+    install -Dm 644 packaging/linux/com.github.siemens.packetflix.desktop -t "${pkgdir}"/usr/share/applications
 }

packaging/aur/packagebuildandtest.sh

@@ -5,13 +5,20 @@ cp -r /pkg /tmp/pkg
 cd /tmp/pkg
 
 makepkg -g >> PKGBUILD
-makepkg --noconfirm --syncdeps --rmdeps --install --clean
+makepkg --noconfirm --syncdeps --rmdeps --clean --install
 
-# Pass back the PKGBUILD with checksum(s) included so someone might publish it
-# as a release artefact.
+# Pass back the PKGBUILD with checksum(s) included so that we can publish it as
+# a release artefact from the release pipeline.
 mkdir -p /pkg/dist
 cp PKGBUILD /pkg/dist/
 
 # Ask tshark to tell us the extcap interfaces it knows of: this must list the
 # packetflix extcap so we know we've installed the plugin properly.
-tshark -D | grep packetflix
+tshark -D | grep packetflix \
+    && echo "OK: tshark detects extcap plugin" \
+    || (echo "FAIL: tshark doesn't detect the packetflix extcap"; exit 1)
+
+# Check that the default URL scheme handler registration is in place.
+xdg-mime query default x-scheme-handler/packetflix | grep "packetflix.desktop" \
+    && echo "OK: packetflix URL scheme handler registered" \
+    || (echo "packetflix URL scheme handler not detected"; exit 1)