feat: Update build process and scripts; enhance report format normalization

Author: John0n1

Makefile

@@ -4,13 +4,25 @@ MODE ?= nuke
 RUN_FLAGS ?=
 
 SH_SOURCES := $(shell find scripts data -type f -name '*.sh' -print) bin/camsniff
-DPKG_BUILD := dpkg-buildpackage -us -uc
+ifndef BUILD_SOURCE
+ifneq (,$(findstring /mnt/,$(ROOT_DIR)))
+BUILD_SOURCE := 0
+else
+BUILD_SOURCE := 1
+endif
+endif
+
+DPKG_BUILD_FLAGS := -us -uc
+ifeq ($(BUILD_SOURCE),0)
+DPKG_BUILD_FLAGS += -b
+endif
+DPKG_BUILD := dpkg-buildpackage $(DPKG_BUILD_FLAGS)
 
 .PHONY: help build clean run lint dev shellcheck install-deps distclean build-coap
 
 help:
 	@echo "Available targets:"
-	@echo "  make build        # dpkg-buildpackage -us -uc"
+	@echo "  make build        # dpkg-buildpackage -us -uc (adds -b on /mnt; set BUILD_SOURCE=1 for source)"
 	@echo "  make clean        # remove build artefacts and temporary state"
 	@echo "  make run MODE=war # invoke sudo ./scripts/camsniff.sh --mode war"
 	@echo "  make lint         # shellcheck + bash -n across project scripts"
@@ -57,4 +69,4 @@ shellcheck:
 	shellcheck -x -P scripts -P data -P . $(SH_SOURCES)
 
 dev: lint
-	$(DPKG_BUILD) --dry-run
+	$(DPKG_BUILD)

README.md

@@ -10,7 +10,7 @@
 [![Python](https://img.shields.io/badge/language-python-black?logo=python\&style=flat-square)](#)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg?style=flat-square)](LICENSE)
 
-**Current version:** `2.2.2` · 
+**Current version:** `2.2.3` · 
 
 <img src="docs/camsniff.png" alt="CamSniff logo" width="320" />
 

debian/camsniff.docs

@@ -1,7 +1,12 @@
+#!/bin/sh
+set -e
+
+cat <<'EOF'
 README.md
 VERSION
 LICENSE
 data/vendors/README.md
 docs/customisation.md
 docs/dev-helpers.md
 docs/camsniff.png
+EOF

debian/camsniff.install

@@ -1,3 +1,7 @@
+#!/bin/sh
+set -e
+
+cat <<'EOF'
 scripts/camsniff.sh usr/lib/camsniff/scripts
 scripts/requirements.txt usr/lib/camsniff/scripts
 scripts/core/* usr/lib/camsniff/scripts/core
@@ -25,5 +29,5 @@ docs/icons/camsniff-128.png usr/share/icons/hicolor/128x128/apps/
 docs/icons/camsniff-64.png usr/share/icons/hicolor/64x64/apps/
 docs/icons/camsniff-48.png usr/share/icons/hicolor/48x48/apps/
 docs/icons/camsniff-32.png usr/share/icons/hicolor/32x32/apps/
-
+EOF
 

debian/camsniff.lintian-overrides

@@ -1,7 +1,12 @@
+#!/bin/sh
+set -e
+
+cat <<'EOF'
 # man-db 2.13.1 emits a false-positive "groff-message" when lintian runs
 #   man --warnings --ditroff -Tutf8 on this page with stdout captured.
 # Remove once the upstream man-db/groff pipeline bug is fixed.
 camsniff: groff-message *command exited with status 1: /usr/libexec/man-db/zsoelim | /usr/libexec/man-db/manconv*
 
 # Desktop file uses sudo because CamSniff requires root privileges for packet capture and low-level scanning
-camsniff: desktop-command-not-in-package sudo [usr/share/applications/camsniff.desktop]
+camsniff: desktop-command-not-in-package sudo [usr/share/applications/camsniff.desktop]
+EOF

debian/camsniff.manpages

@@ -1 +1,6 @@
-docs/camsniff.1
+#!/bin/sh
+set -e
+
+cat <<'EOF'
+docs/camsniff.1
+EOF

debian/camsniff.substvars

@@ -1,2 +1,2 @@
 misc:Depends=
-misc:Pre-Depends=
+misc:Pre-Depends=

debian/clean

@@ -1,4 +1,4 @@
-tmp
-dev
-.venv
-venv
+#!/bin/sh
+set -e
+
+rm -rf -- tmp dev .venv venv

debian/rules

@@ -18,3 +18,17 @@ override_dh_auto_build:
 
 override_dh_auto_test:
 	# No automated test suite during package build
+
+override_dh_builddeb:
+	set -e; \
+	for pkg in $$(dh_listpackages); do \
+		build_dir="debian/$$pkg"; \
+		tmp_dir=$$(mktemp -d); \
+		cp -a "$$build_dir/." "$$tmp_dir/"; \
+		if [ -d "$$tmp_dir/DEBIAN" ]; then \
+			chmod 0755 "$$tmp_dir/DEBIAN"; \
+			find "$$tmp_dir/DEBIAN" -type f -exec chmod 0644 {} +; \
+		fi; \
+		dpkg-deb --root-owner-group --build "$$tmp_dir" ..; \
+		rm -rf "$$tmp_dir"; \
+	done

scripts/camsniff.sh

@@ -803,6 +803,25 @@ run_ssdp_discovery() {
     rm -f "$ssdp_tmp"
 }
 
+normalize_report_format() {
+    local raw="$1"
+    raw=$(printf '%s' "$raw" | tr '[:upper:]' '[:lower:]')
+    case "$raw" in
+        md|markdown)
+            echo "markdown"
+            ;;
+        html|htm)
+            echo "html"
+            ;;
+        both|all)
+            echo "both"
+            ;;
+        *)
+            echo ""
+            ;;
+    esac
+}
+
 while [[ $# -gt 0 ]]; do
     case "$1" in
         -m|--mode)
@@ -1144,25 +1163,6 @@ apply_optional_tool_overrides() {
     fi
 }
 
-normalize_report_format() {
-    local raw="$1"
-    raw=$(printf '%s' "$raw" | tr '[:upper:]' '[:lower:]')
-    case "$raw" in
-        md|markdown)
-            echo "markdown"
-            ;;
-        html|htm)
-            echo "html"
-            ;;
-        both|all)
-            echo "both"
-            ;;
-        *)
-            echo ""
-            ;;
-    esac
-}
-
 generate_reports() {
     local format="$1"
     [[ -z $format ]] && return 0
@@ -1481,10 +1481,10 @@ render_smart_summary() {
     local ip
     for ip in "${SMART_TARGETS[@]}"; do
         local score=${ip_pre_score[$ip]:-0}
-        local reasons=${ip_pre_reasons[$ip]:-}
+        local reason_summary=${ip_pre_reasons[$ip]:-}
         printf "  %s%-15s%s score=%s" "$CYAN" "$ip" "$RESET" "$score"
-        if [[ -n $reasons ]]; then
-            printf " (%s)" "$reasons"
+        if [[ -n $reason_summary ]]; then
+            printf " (%s)" "$reason_summary"
         fi
         echo ""
         shown=$((shown + 1))