From d825a9cc8318736863b73b80fe3da6d7f5393157 Mon Sep 17 00:00:00 2001
From: Daniel <dhaavi@users.noreply.github.com>
Date: Mon, 1 Feb 2021 17:05:21 +0100
Subject: [PATCH] Update tooling

---
 .gitignore                  | 3 +++
 .golangci.yml               | 1 +
 cmds/portmaster-core/build  | 2 +-
 cmds/portmaster-start/build | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3d3e9052..7827163e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,9 @@ main.exe
 # Dist dir
 dist
 
+# Custom dev deops
+go.mod.*
+
 # vendor dir
 vendor
 
diff --git a/.golangci.yml b/.golangci.yml
index 0b60d3bb..efc59c42 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -10,6 +10,7 @@ linters:
     - gomnd
     - gomodguard
     - goerr113
+    - testpackage
 
 linters-settings:
   godox:
diff --git a/cmds/portmaster-core/build b/cmds/portmaster-core/build
index e73c3e74..e8803132 100755
--- a/cmds/portmaster-core/build
+++ b/cmds/portmaster-core/build
@@ -55,4 +55,4 @@ fi
 
 # build
 BUILD_PATH="github.com/safing/portbase/info"
-go build $DEV -ldflags "-X ${BUILD_PATH}.commit=${BUILD_COMMIT} -X ${BUILD_PATH}.buildOptions=${BUILD_BUILDOPTIONS} -X ${BUILD_PATH}.buildUser=${BUILD_USER} -X ${BUILD_PATH}.buildHost=${BUILD_HOST} -X ${BUILD_PATH}.buildDate=${BUILD_DATE} -X ${BUILD_PATH}.buildSource=${BUILD_SOURCE}" $*
+go build $DEV -ldflags "-X ${BUILD_PATH}.commit=${BUILD_COMMIT} -X ${BUILD_PATH}.buildOptions=${BUILD_BUILDOPTIONS} -X ${BUILD_PATH}.buildUser=${BUILD_USER} -X ${BUILD_PATH}.buildHost=${BUILD_HOST} -X ${BUILD_PATH}.buildDate=${BUILD_DATE} -X ${BUILD_PATH}.buildSource=${BUILD_SOURCE}" "$@"
diff --git a/cmds/portmaster-start/build b/cmds/portmaster-start/build
index 26fb3525..8a72c6ea 100755
--- a/cmds/portmaster-start/build
+++ b/cmds/portmaster-start/build
@@ -71,4 +71,4 @@ echo "Run the compiled binary with the -version flag to see the information incl
 
 # build
 BUILD_PATH="github.com/safing/portbase/info"
-go build -ldflags "$EXTRA_LD_FLAGS -X ${BUILD_PATH}.commit=${BUILD_COMMIT} -X ${BUILD_PATH}.buildOptions=${BUILD_BUILDOPTIONS} -X ${BUILD_PATH}.buildUser=${BUILD_USER} -X ${BUILD_PATH}.buildHost=${BUILD_HOST} -X ${BUILD_PATH}.buildDate=${BUILD_DATE} -X ${BUILD_PATH}.buildSource=${BUILD_SOURCE}" $*
+go build -ldflags "$EXTRA_LD_FLAGS -X ${BUILD_PATH}.commit=${BUILD_COMMIT} -X ${BUILD_PATH}.buildOptions=${BUILD_BUILDOPTIONS} -X ${BUILD_PATH}.buildUser=${BUILD_USER} -X ${BUILD_PATH}.buildHost=${BUILD_HOST} -X ${BUILD_PATH}.buildDate=${BUILD_DATE} -X ${BUILD_PATH}.buildSource=${BUILD_SOURCE}" "$@"