fix lint errors, improve UX

Author: tstromberg

Makefile

@@ -37,10 +37,10 @@ deps:
 	$(GOMOD) tidy
 
 run-server: server
-	./$(SERVER_BINARY) -git=/tmp/gitmdm-repo
+	$(SERVER_BINARY) -git=/tmp/gitmdm-repo
 
 run-agent: agent
-	./$(AGENT_BINARY) -server=http://localhost:8080
+	$(AGENT_BINARY) -server=http://localhost:8080
 
 build-linux:
 	GOOS=linux GOARCH=amd64 $(GOBUILD) $(BUILD_FLAGS) -o $(SERVER_BINARY)-linux-amd64 $(SERVER_PATH)
@@ -82,61 +82,57 @@ help:
 	@echo "  make build-all   - Build for all platforms"
 	@echo "  make ko-build    - Build server container with ko"
 	@echo "  make ko-publish  - Publish server container with ko"
-# BEGIN: lint-install .
-# http://github.com/codeGROOVE-dev/lint-install
+
+# BEGIN: lint-install - POSIX-compliant version
+# Works with both BSD make and GNU make
 
 .PHONY: lint
 lint: _lint
 
-LINT_ARCH := $(shell uname -m)
-LINT_OS := $(shell uname)
-LINT_OS_LOWER := $(shell echo $(LINT_OS) | tr '[:upper:]' '[:lower:]')
-LINT_ROOT := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
+# Use simple assignment for maximum compatibility
+LINT_ARCH != uname -m || echo x86_64
+LINT_OS != uname || echo Darwin
+LINT_ROOT = .
 
-# shellcheck and hadolint lack arm64 native binaries: rely on x86-64 emulation
-ifeq ($(LINT_OS),Darwin)
-	ifeq ($(LINT_ARCH),arm64)
-		LINT_ARCH=x86_64
-	endif
-endif
+LINTERS =
+FIXERS =
 
-LINTERS :=
-FIXERS :=
+GOLANGCI_LINT_CONFIG = $(LINT_ROOT)/.golangci.yml
+GOLANGCI_LINT_VERSION = v2.3.1
+GOLANGCI_LINT_BIN = $(LINT_ROOT)/out/linters/golangci-lint-$(GOLANGCI_LINT_VERSION)-$(LINT_ARCH)
 
-GOLANGCI_LINT_CONFIG := $(LINT_ROOT)/.golangci.yml
-GOLANGCI_LINT_VERSION ?= v2.3.1
-GOLANGCI_LINT_BIN := $(LINT_ROOT)/out/linters/golangci-lint-$(GOLANGCI_LINT_VERSION)-$(LINT_ARCH)
 $(GOLANGCI_LINT_BIN):
 	mkdir -p $(LINT_ROOT)/out/linters
 	rm -rf $(LINT_ROOT)/out/linters/golangci-lint-*
 	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(LINT_ROOT)/out/linters $(GOLANGCI_LINT_VERSION)
-	mv $(LINT_ROOT)/out/linters/golangci-lint $@
+	mv $(LINT_ROOT)/out/linters/golangci-lint $(GOLANGCI_LINT_BIN)
 
 LINTERS += golangci-lint-lint
 golangci-lint-lint: $(GOLANGCI_LINT_BIN)
-	find . -name go.mod -execdir "$(GOLANGCI_LINT_BIN)" run -c "$(GOLANGCI_LINT_CONFIG)" \;
+	find . -name go.mod -execdir $(GOLANGCI_LINT_BIN) run -c $(GOLANGCI_LINT_CONFIG) \;
 
 FIXERS += golangci-lint-fix
 golangci-lint-fix: $(GOLANGCI_LINT_BIN)
-	find . -name go.mod -execdir "$(GOLANGCI_LINT_BIN)" run -c "$(GOLANGCI_LINT_CONFIG)" --fix \;
+	find . -name go.mod -execdir $(GOLANGCI_LINT_BIN) run -c $(GOLANGCI_LINT_CONFIG) --fix \;
+
+YAMLLINT_VERSION = 1.37.1
+YAMLLINT_ROOT = $(LINT_ROOT)/out/linters/yamllint-$(YAMLLINT_VERSION)
+YAMLLINT_BIN = $(YAMLLINT_ROOT)/dist/bin/yamllint
 
-YAMLLINT_VERSION ?= 1.37.1
-YAMLLINT_ROOT := $(LINT_ROOT)/out/linters/yamllint-$(YAMLLINT_VERSION)
-YAMLLINT_BIN := $(YAMLLINT_ROOT)/dist/bin/yamllint
 $(YAMLLINT_BIN):
 	mkdir -p $(LINT_ROOT)/out/linters
 	rm -rf $(LINT_ROOT)/out/linters/yamllint-*
 	curl -sSfL https://github.com/adrienverge/yamllint/archive/refs/tags/v$(YAMLLINT_VERSION).tar.gz | tar -C $(LINT_ROOT)/out/linters -zxf -
-	cd $(YAMLLINT_ROOT) && pip3 install --target dist . || pip install --target dist .
+	cd $(YAMLLINT_ROOT) && (pip3 install --target dist . || pip install --target dist .)
 
 LINTERS += yamllint-lint
 yamllint-lint: $(YAMLLINT_BIN)
-	PYTHONPATH=$(YAMLLINT_ROOT)/dist $(YAMLLINT_ROOT)/dist/bin/yamllint .
+	PYTHONPATH=$(YAMLLINT_ROOT)/dist $(YAMLLINT_BIN) .
 
 .PHONY: _lint $(LINTERS)
 _lint: $(LINTERS)
 
 .PHONY: fix $(FIXERS)
 fix: $(FIXERS)
 
-# END: lint-install .
+# END: lint-install

cmd/agent/executeCheck.go

@@ -17,7 +17,7 @@ import (
 func (a *Agent) executeCheck(ctx context.Context, checkName string, rule config.CommandRule) gitmdm.CommandOutput {
 	// Handle file checks
 	if rule.File != "" {
-		return a.readFile(ctx, checkName, rule)
+		return a.readFile(checkName, rule)
 	}
 
 	// Handle command checks
@@ -33,7 +33,7 @@ func (a *Agent) executeCheck(ctx context.Context, checkName string, rule config.
 }
 
 // readFile reads a file and returns its contents as a CommandOutput.
-func (a *Agent) readFile(ctx context.Context, checkName string, rule config.CommandRule) gitmdm.CommandOutput {
+func (*Agent) readFile(checkName string, rule config.CommandRule) gitmdm.CommandOutput {
 	start := time.Now()
 
 	if *debug {

cmd/agent/executeCommand.go

@@ -14,7 +14,7 @@ import (
 	"time"
 )
 
-// getSecurePath returns a secure PATH based on the OS
+// getSecurePath returns a secure PATH based on the OS.
 func getSecurePath() string {
 	switch runtime.GOOS {
 	case "windows":