A bit of cleanup

Author: rupor-github

.golangci.yml

@@ -3,9 +3,11 @@ run:
     - build
     - cmake
     - doc
+    - kindlegen
+    - static
+    - testdata
     - tools
     - vendor
-    - util
   tests: false
   issues-exit-code: 0
 
@@ -19,22 +21,31 @@ linters:
     - gochecknoglobals
     - gochecknoinits
     - whitespace
+    - wsl
+    - gomnd
   fast: false
 
 linters-settings:
   lll:
     # max line length, lines longer will be reported. Default is 120.
     # '\t' is counted as 1 character by default, and can be changed with the tab-width option
-    line-length: 180
+    line-length: 185
     # tab width in spaces. Default to 1.
     tab-width: 4
-
+  gofmt:
+    simplify: true
   funlen:
-    lines: 100
-    statements: 60
+    lines: 250
+    statements: 120
+  dogsled:
+    max-blank-identifiers: 3
 
 issues:
   exclude-rules:
     - text: "weak cryptographic primitive"
       linters:
         - gosec
+    - text: "Subprocess launched with function call as argument or cmd arguments"
+      linters:
+        - gosec
+

CMakeLists.txt

@@ -59,7 +59,7 @@ endif()
 
 # Project version number
 set(PRJ_VERSION_MAJOR 1)
-set(PRJ_VERSION_MINOR 4)
+set(PRJ_VERSION_MINOR 41)
 
 if (EXISTS "${PROJECT_SOURCE_DIR}/.git" AND IS_DIRECTORY "${PROJECT_SOURCE_DIR}/.git")
     execute_process(COMMAND ${CMAKE_SOURCE_DIR}/cmake/githash.sh ${GIT_EXECUTABLE}
@@ -155,19 +155,19 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
     ########################################################################################################
 
     # Running linters on main target
-    find_program(GO_LINTER golangci-lint)
+    find_program(GO_LINTER golangci-lint PATHS ${PROJECT_BINARY_DIR} NO_DEFAULT_PATH)
     if(NOT GO_LINTER)
-        set(golangci-lint-ver "1.17.1")
+        set(golangci-lint-ver "1.22.2")
         message(STATUS "Preparing golangci-lint ${golangci-lint-ver}")
         file(DOWNLOAD "https://github.com/golangci/golangci-lint/releases/download/v${golangci-lint-ver}/golangci-lint-${golangci-lint-ver}-linux-amd64.tar.gz" ${PROJECT_BINARY_DIR}/golangci-lint.tar.gz
             INACTIVITY_TIMEOUT 60
             TIMEOUT 300
             STATUS DOWNLOAD_RES
-            EXPECTED_HASH SHA256=62693d3351858206af0bfe975f7f79a8ac9124502e8de7906f377c231f37f7d3)
+            EXPECTED_HASH SHA256=109d38cdc89f271392f5a138d6782657157f9f496fd4801956efa2d0428e0cbe)
         list(GET DOWNLOAD_RES 0 RES)
         list(GET DOWNLOAD_RES 1 MSG)
         if(RES)
-            message(FATAL_ERROR, ${MSG})
+            message(FATAL_ERROR "${MSG} : ${RES}")
         endif()
         execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf golangci-lint.tar.gz WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
         execute_process(COMMAND ${CMAKE_COMMAND} -E copy golangci-lint-${golangci-lint-ver}-linux-amd64/golangci-lint golangci-lint WORKING_DIRECTORY ${PROJECT_BINARY_DIR})

README.md

@@ -59,7 +59,7 @@ After that just execute
 	Set-Service -StartupType Automatic ssh-agent
 ```
 
-2. Run `wsl-ssh-agent-gui.exe`. Basically there are several possible scenarios:
+2. Run `wsl-ssh-agent-gui.exe` with arguments which make sense for your usage. Basically there are several ways:
 
 	* Using `-socket` option specify "well known" path on Windows side and then properly specify the same path in every WSL session:
 

static/files.go

@@ -32,7 +32,7 @@ func notifySystem(debug bool) {
 		log.Printf("Broadcasting environment change. From %s", start)
 	}
 
-	_, _, _ = proc.Call(uintptr(uintptr(windows.InvalidHandle)),
+	_, _, _ = proc.Call(uintptr(windows.InvalidHandle),
 		uintptr(wmSETTINGCHANGE),
 		0,
 		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr("Environment"))),