From bc5b039a40454132daae399efb491a4eca4fa7c8 Mon Sep 17 00:00:00 2001
From: 1138-4EB <1138-4EB@users.noreply.github.com>
Date: Wed, 2 Jan 2019 00:58:22 +0100
Subject: [PATCH] replace gometalinter with golangci-lint

---
 .golangci.yml      | 20 ++++++++++++++++++++
 .gometalinter.json | 38 --------------------------------------
 frontend           |  2 +-
 wizard.sh          | 11 ++++-------
 4 files changed, 25 insertions(+), 46 deletions(-)
 create mode 100644 .golangci.yml
 delete mode 100644 .gometalinter.json

diff --git a/.golangci.yml b/.golangci.yml
new file mode 100644
index 00000000..20ad14f9
--- /dev/null
+++ b/.golangci.yml
@@ -0,0 +1,20 @@
+run:
+  deadline: 5m
+
+linters:
+  enable:
+    - deadcode
+    - govet
+    - ineffassign
+    - interfacer
+    - maligned
+    - megacheck
+    - structcheck
+    - unconvert
+    - varcheck
+  enable-all: false
+  disable-all: true
+#  presets:
+#    - bugs
+#    - unused
+  fast: false
diff --git a/.gometalinter.json b/.gometalinter.json
deleted file mode 100644
index ac903f42..00000000
--- a/.gometalinter.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "Enable": [
-    "deadcode",
-    "gotype",
-    "gotypex",
-    "ineffassign",
-    "interfacer",
-    "maligned",
-    "megacheck",
-    "structcheck",
-    "unconvert",
-    "varcheck",
-    "vet"
-  ],
-  "Disable": [
-    "dupl",
-    "errcheck",
-    "gochecknoglobals",
-    "gochecknoinits",
-    "goconst",
-    "gocyclo",
-    "gofmt",
-    "goimports",
-    "golint",
-    "gosec",
-    "gosimple",
-    "lll",
-    "misspell",
-    "nakedret",
-    "safesql",
-    "staticcheck",
-    "test",
-    "testify",
-    "unparam",
-    "unused",
-    "vetshadow"
-  ]
-}
diff --git a/frontend b/frontend
index a9852a50..26423339 160000
--- a/frontend
+++ b/frontend
@@ -1 +1 @@
-Subproject commit a9852a50b409c7c2d57663e6cf53e0980eee87b3
+Subproject commit 2642333928b21dd76c5bfb2457a19502d73d6475
diff --git a/wizard.sh b/wizard.sh
index 91d206f6..c0db35c8 100755
--- a/wizard.sh
+++ b/wizard.sh
@@ -112,16 +112,13 @@ buildBinary () {
 
 lint () {
   cd $REPO
-  dolint='gometalinter --exclude="rice-box.go" --exclude="vendor" --deadline=300s ./...'
-  WDIR="/go/src/github.com/filebrowser/filebrowser"
 
   if [ "$USE_DOCKER" != "" ]; then
-    $(command -v winpty) docker run --rm -itv "/$(pwd):/$WDIR" -w "/$WDIR" filebrowser/dev sh -c "\
-      GO111MODULE=on go get -v ./... && \
-      GO111MODULE=on go mod vendor && \
-      GO111MODULE=off $dolint"
+    $(command -v winpty) docker run --rm -itv "/$(pwd)://src" -w "//src" filebrowser/dev sh -c "\
+      go get -v ./... && \
+      golangci-lint run -v"
   else
-    $dolint
+    golangci-lint run -v
   fi
 }