From e3f422f9ba12d728a9f186e6d15c4a20318f9981 Mon Sep 17 00:00:00 2001
From: kyu08 <49891479+kyu08@users.noreply.github.com>
Date: Sat, 12 Jul 2025 18:20:06 +0900
Subject: [PATCH 1/3] Fix golangci-lint installation path in dev container

---
 .bin/.gitkeep                   | 0
 .devcontainer/Dockerfile        | 2 --
 .devcontainer/devcontainer.json | 2 +-
 .gitignore                      | 3 ++-
 4 files changed, 3 insertions(+), 4 deletions(-)
 create mode 100644 .bin/.gitkeep

diff --git a/.bin/.gitkeep b/.bin/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 03c43d4119d..6e7b5fd5825 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -5,8 +5,6 @@ ARG VARIANT=1-bullseye
 FROM golang:${VARIANT}
 
 RUN go install mvdan.cc/gofumpt@latest
-RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.50.0
-RUN golangci-lint --version
 
 # [Optional] Uncomment this section to install additional OS packages.
 # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 73f37e3ecca..1626eddb768 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -62,7 +62,7 @@
 
   // See https://www.kenmuse.com/blog/avoiding-dubious-ownership-in-dev-containers/ for the safe.directory part
   // The defaultBranch part is required for our deprecated integration tests.
-  "postStartCommand": "git config --global --add safe.directory ${containerWorkspaceFolder} && git config --global init.defaultBranch master",
+  "postStartCommand": "git config --global --add safe.directory ${containerWorkspaceFolder} && git config --global init.defaultBranch master && curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ./.bin",
 
   // Set `remoteUser` to `root` to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
   "remoteUser": "vscode"
diff --git a/.gitignore b/.gitignore
index e9c93214f5b..b547043074c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,8 @@ coverage.txt
 .idea/
 
 # Binaries
-.bin/
+.bin/*
+!.bin/.gitkeep
 lazygit
 lazygit.exe
 

From 32e7b92311b933ab76e160d11b622ee190d64023 Mon Sep 17 00:00:00 2001
From: kyu08 <49891479+kyu08@users.noreply.github.com>
Date: Sun, 13 Jul 2025 13:29:46 +0900
Subject: [PATCH 2/3] fixup! Fix golangci-lint installation path in dev
 container

---
 .bin/.gitkeep                   | 0
 .devcontainer/devcontainer.json | 2 +-
 .gitignore                      | 3 +--
 3 files changed, 2 insertions(+), 3 deletions(-)
 delete mode 100644 .bin/.gitkeep

diff --git a/.bin/.gitkeep b/.bin/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 1626eddb768..c2d5078d88d 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -62,7 +62,7 @@
 
   // See https://www.kenmuse.com/blog/avoiding-dubious-ownership-in-dev-containers/ for the safe.directory part
   // The defaultBranch part is required for our deprecated integration tests.
-  "postStartCommand": "git config --global --add safe.directory ${containerWorkspaceFolder} && git config --global init.defaultBranch master && curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ./.bin",
+  "postStartCommand": "git config --global --add safe.directory ${containerWorkspaceFolder} && git config --global init.defaultBranch master && test -e .bin/golangci-lint || { mkdir -p .bin && ln -s $(go env GOPATH)/bin/golangci-lint .bin/golangci-lint; }",
 
   // Set `remoteUser` to `root` to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
   "remoteUser": "vscode"
diff --git a/.gitignore b/.gitignore
index b547043074c..e9c93214f5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,8 +14,7 @@ coverage.txt
 .idea/
 
 # Binaries
-.bin/*
-!.bin/.gitkeep
+.bin/
 lazygit
 lazygit.exe
 

From 718ed5cf17fc08fc8a9cc1fe849ad678f6b3b7a1 Mon Sep 17 00:00:00 2001
From: kyu08 <49891479+kyu08@users.noreply.github.com>
Date: Sun, 13 Jul 2025 22:41:19 +0900
Subject: [PATCH 3/3] fixup! Fix golangci-lint installation path in dev
 container

---
 .devcontainer/devcontainer.json | 2 +-
 Makefile                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index c2d5078d88d..73f37e3ecca 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -62,7 +62,7 @@
 
   // See https://www.kenmuse.com/blog/avoiding-dubious-ownership-in-dev-containers/ for the safe.directory part
   // The defaultBranch part is required for our deprecated integration tests.
-  "postStartCommand": "git config --global --add safe.directory ${containerWorkspaceFolder} && git config --global init.defaultBranch master && test -e .bin/golangci-lint || { mkdir -p .bin && ln -s $(go env GOPATH)/bin/golangci-lint .bin/golangci-lint; }",
+  "postStartCommand": "git config --global --add safe.directory ${containerWorkspaceFolder} && git config --global init.defaultBranch master",
 
   // Set `remoteUser` to `root` to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
   "remoteUser": "vscode"
diff --git a/Makefile b/Makefile
index f972100a143..ca8f34b98ed 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ format:
 
 .PHONY: lint
 lint:
-	./scripts/lint.sh
+	go run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.0.2 run
 
 # For more details about integration test, see https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md.
 .PHONY: integration-test-tui