Bump to v1.0.1

Author: smitmartijn

.github/workflows/external-pcap-service.yml

@@ -21,7 +21,7 @@ on:
 
 jobs:
   build-linux:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout repository
@@ -133,17 +133,33 @@ jobs:
         run: |
           mkdir -p dist/packages
 
-          # Copy packages from script build directories
-          find scripts -name "*.deb" -exec cp {} dist/packages/ \; 2>/dev/null || echo "No .deb files found"
-          find scripts -name "*.rpm" -exec cp {} dist/packages/ \; 2>/dev/null || echo "No .rpm files found"
-          find scripts -name "*.pkg.tar.*" -exec cp {} dist/packages/ \; 2>/dev/null || echo "No .pkg.tar.* files found"
+          # Debug: List what files exist after build
+          echo "=== Files in dist/ directory ==="
+          ls -la dist/ || echo "dist/ directory is empty or doesn't exist"
+          echo ""
+          echo "=== Files in scripts/ directory tree ==="
+          find scripts -type f -name "*.deb" -o -name "*.rpm" -o -name "*.pkg.tar.*" | head -20 || echo "No package files found in scripts/"
+          echo ""
+
+          # Copy packages - check both locations to be safe
+          # All build scripts should move final packages to dist/, but let's check both
+
+          # First, copy from dist/ directory (primary location)
+          find dist -maxdepth 1 -name "*.deb" -exec cp {} dist/packages/ \; 2>/dev/null || echo "No .deb files found in dist/"
+          find dist -maxdepth 1 -name "*.rpm" -exec cp {} dist/packages/ \; 2>/dev/null || echo "No .rpm files found in dist/"
+          find dist -maxdepth 1 -name "*.pkg.tar.*" -exec cp {} dist/packages/ \; 2>/dev/null || echo "No .pkg.tar.* files found in dist/"
+
+          # Also check scripts/ directory as fallback (in case move failed)
+          find scripts -name "*.deb" -exec cp {} dist/packages/ \; 2>/dev/null || echo "No .deb files found in scripts/"
+          find scripts -name "*.rpm" -exec cp {} dist/packages/ \; 2>/dev/null || echo "No .rpm files found in scripts/"
+          find scripts -name "*.pkg.tar.*" -exec cp {} dist/packages/ \; 2>/dev/null || echo "No .pkg.tar.* files found in scripts/"
 
           # Copy source distribution and standalone binary
           cp -v dist/*.tar.gz dist/packages/ 2>/dev/null || echo "No .tar.gz files found"
           cp -v whatpulse-pcap-service-${{ steps.version.outputs.version }}-linux-amd64 dist/packages/
 
           echo "📦 Final artifacts:"
-          ls -la ../dist/packages/
+          ls -la dist/packages/
 
       - name: Generate checksums
         run: |
@@ -158,6 +174,10 @@ jobs:
           path: dist/packages/
           retention-days: 30
 
+      - name: Get build date
+        id: date
+        run: echo "date=$(date -u +"%Y-%m-%d %H:%M:%S UTC")" >> $GITHUB_OUTPUT
+
       - name: Create GitHub Release
         if: |
           (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')) ||
@@ -174,7 +194,7 @@ jobs:
             ---
 
             **Built from commit:** ${{ github.sha }}
-            **Build date:** $(date -u +"%Y-%m-%d %H:%M:%S UTC")
+            **Build date:** ${{ steps.date.outputs.date }}
           files: |
             dist/packages/*
           draft: false

README.md

@@ -14,38 +14,55 @@ When WhatPulse runs as an AppImage or in other restricted environments, it may n
 
 ### Package Manager Installation (Recommended)
 
+Download the latest packages from the [GitHub Releases page](https://github.com/whatpulse/external-pcap-service/releases/latest).
+
 Choose the package format for your Linux distribution:
 
 #### Debian/Ubuntu (.deb)
 ```bash
-wget https://releases.whatpulse.org/latest/external-pcap-service/whatpulse-pcap-service_1.0.0_amd64.deb
-sudo dpkg -i whatpulse-pcap-service_1.0.0_amd64.deb
+# Download from releases page, then:
+sudo dpkg -i whatpulse-pcap-service_*_amd64.deb
 sudo apt-get install -f  # Fix any missing dependencies
 ```
 
 #### Red Hat/Fedora/CentOS (.rpm)
 ```bash
-wget https://releases.whatpulse.org/latest/external-pcap-service/whatpulse-pcap-service-1.0.0-1.x86_64.rpm
-sudo rpm -ivh whatpulse-pcap-service-1.0.0-1.x86_64.rpm
+# Download from releases page, then:
+sudo rpm -ivh whatpulse-pcap-service-*-1.x86_64.rpm
 # OR on Fedora/newer systems:
-sudo dnf install whatpulse-pcap-service-1.0.0-1.x86_64.rpm
+sudo dnf install whatpulse-pcap-service-*-1.x86_64.rpm
+```
+
+#### Arch Linux (.pkg.tar.*)
+```bash
+# Download from releases page, then:
+sudo pacman -U whatpulse-pcap-service-*-1-x86_64.pkg.tar.*
 ```
 
-#### Arch Linux (.pkg.tar.xz)
+### Quick Download Commands
+
+For automated downloads, use these commands to get the latest release:
+
 ```bash
-wget https://releases.whatpulse.org/latest/external-pcap-service/whatpulse-pcap-service-1.0.0-1-x86_64.pkg.tar.xz
-sudo pacman -U whatpulse-pcap-service-1.0.0-1-x86_64.pkg.tar.xz
+# Get latest release info
+LATEST_URL=$(curl -s https://api.github.com/repos/whatpulse/external-pcap-service/releases/latest | grep "browser_download_url" | grep "deb" | cut -d '"' -f 4)
+wget "$LATEST_URL"
+
+# Or browse all releases:
+# https://github.com/whatpulse/external-pcap-service/releases
 ```
 
 ### Build from Source
 
-If packages aren't available for your distribution:
+If packages aren't available for your distribution, or you prefer to build from source:
 
 ```bash
-# Download and extract source
-wget https://releases.whatpulse.org/latest/external-pcap-service/whatpulse-pcap-service-1.0.0-source.tar.gz
-tar xzf whatpulse-pcap-service-1.0.0-source.tar.gz
-cd whatpulse-pcap-service-1.0.0
+# Download and extract source from GitHub releases
+# Visit: https://github.com/whatpulse/external-pcap-service/releases
+# Download: whatpulse-pcap-service-VERSION-source.tar.gz
+
+tar xzf whatpulse-pcap-service-*-source.tar.gz
+cd whatpulse-pcap-service-*
 
 # Install build dependencies
 # Debian/Ubuntu:

pcapservice.h

@@ -28,7 +28,7 @@
 #include <set>
 #include <cstdint>
 
-#define PCAP_SERVICE_VERSION "1.0.0"
+#define PCAP_SERVICE_VERSION "1.0.1"
 
 /**
  * Main service class that manages PCap capture and network communication

release.sh

@@ -2,17 +2,43 @@
 set -e
 
 # External PCap Service Release Helper Script
-# Usage: ./release.sh <version> [--push]
+# Usage: ./release.sh <version> [--push] [--force]
 
 VERSION="$1"
-PUSH_FLAG="$2"
+PUSH_FLAG=""
+FORCE_FLAG=""
+
+# Parse arguments
+shift
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        --push)
+            PUSH_FLAG="--push"
+            shift
+            ;;
+        --force)
+            FORCE_FLAG="--force"
+            shift
+            ;;
+        *)
+            echo "Unknown option: $1"
+            exit 1
+            ;;
+    esac
+done
 
 if [ -z "$VERSION" ]; then
-    echo "Usage: $0 <version> [--push]"
+    echo "Usage: $0 <version> [--push] [--force]"
     echo ""
     echo "Examples:"
-    echo "  $0 1.0.1         # Prepare release (update version, commit, create tag)"
-    echo "  $0 1.0.1 --push  # Prepare and push to trigger GitHub Actions"
+    echo "  $0 1.0.1                    # Prepare release (update version, commit, create tag)"
+    echo "  $0 1.0.1 --push             # Prepare and push to trigger GitHub Actions"
+    echo "  $0 1.0.1 --force            # Force overwrite existing version/tag"
+    echo "  $0 1.0.1 --push --force     # Force overwrite and push immediately"
+    echo ""
+    echo "Options:"
+    echo "  --push   Push changes and tag to remote repository immediately"
+    echo "  --force  Overwrite existing version/tag, force push if needed"
     echo ""
     exit 1
 fi
@@ -37,8 +63,12 @@ CURRENT_VERSION=$(grep '#define PCAP_SERVICE_VERSION ' pcapservice.h | awk -F '"
 echo "Current version in source: $CURRENT_VERSION"
 echo "Target version: $VERSION"
 
-if [ "$CURRENT_VERSION" = "$VERSION" ]; then
+if [ "$CURRENT_VERSION" = "$VERSION" ] && [ -z "$FORCE_FLAG" ]; then
     echo "⚠️  Version is already set to $VERSION in source code"
+    echo "    Use --force to overwrite existing version"
+    exit 1
+elif [ "$CURRENT_VERSION" = "$VERSION" ] && [ -n "$FORCE_FLAG" ]; then
+    echo "⚠️  Version is already set to $VERSION in source code (--force specified, continuing)"
 else
     echo "📝 Updating version in source code..."
     sed -i.bak "s/#define PCAP_SERVICE_VERSION \".*\"/#define PCAP_SERVICE_VERSION \"$VERSION\"/" pcapservice.h
@@ -50,7 +80,12 @@ fi
 if ! git diff --quiet pcapservice.h; then
     echo "📦 Committing version update..."
     git add pcapservice.h
-    git commit -m "bump version to $VERSION"
+    if [ -n "$FORCE_FLAG" ]; then
+        # Force commit even if there might be conflicts
+        git commit -m "bump version to $VERSION" || git commit --amend -m "bump version to $VERSION"
+    else
+        git commit -m "bump version to $VERSION"
+    fi
     echo "✅ Version update committed"
 else
     echo "ℹ️  No changes to commit"
@@ -59,7 +94,16 @@ fi
 # Create tag
 TAG_NAME="v$VERSION"
 if git rev-parse "$TAG_NAME" >/dev/null 2>&1; then
-    echo "⚠️  Tag $TAG_NAME already exists"
+    if [ -n "$FORCE_FLAG" ]; then
+        echo "⚠️  Tag $TAG_NAME already exists (--force specified, recreating)"
+        git tag -d "$TAG_NAME"  # Delete local tag
+        git tag -a "$TAG_NAME" -m "External PCap Service v$VERSION"
+        echo "✅ Tag $TAG_NAME recreated"
+    else
+        echo "⚠️  Tag $TAG_NAME already exists"
+        echo "    Use --force to overwrite existing tag"
+        exit 1
+    fi
 else
     echo "🏷️  Creating tag $TAG_NAME..."
     git tag -a "$TAG_NAME" -m "External PCap Service v$VERSION"
@@ -72,22 +116,42 @@ echo ""
 
 if [ "$PUSH_FLAG" = "--push" ]; then
     echo "🚢 Pushing changes and tag to trigger GitHub Actions..."
-    git push origin HEAD
-    git push origin "$TAG_NAME"
+
+    if [ -n "$FORCE_FLAG" ]; then
+        echo "   Using --force push for tag (will overwrite remote tag if exists)"
+        git push origin HEAD
+        git push origin "$TAG_NAME" --force
+    else
+        git push origin HEAD
+        git push origin "$TAG_NAME"
+    fi
+
     echo ""
     echo "✅ Changes pushed! GitHub Actions will now build and release."
     echo "   View progress at: https://github.com/whatpulse/linux-external-pcap-service/actions"
 else
     echo "Next steps:"
     echo "1. Review the changes: git log --oneline -n 2"
-    echo "2. Push to trigger release: git push origin HEAD && git push origin $TAG_NAME"
-    echo "   Or run: $0 $VERSION --push"
+
+    if [ -n "$FORCE_FLAG" ]; then
+        echo "2. Push to trigger release (with force): git push origin HEAD && git push origin $TAG_NAME --force"
+        echo "   Or run: $0 $VERSION --push --force"
+    else
+        echo "2. Push to trigger release: git push origin HEAD && git push origin $TAG_NAME"
+        echo "   Or run: $0 $VERSION --push"
+    fi
+
     echo ""
     echo "The GitHub Actions workflow will automatically:"
     echo "• Build the service for Linux"
     echo "• Create packages (deb, rpm, binary)"
     echo "• Generate checksums"
     echo "• Create GitHub release with all assets"
+
+    if [ -n "$FORCE_FLAG" ]; then
+        echo ""
+        echo "⚠️  Force mode enabled - this will overwrite existing releases!"
+    fi
 fi
 
 echo ""