merge

License: MIT
Signed-off-by: Henrique Dias <hacdias@gmail.com>

.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

.gometalinter.json

@@ -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"
-  ]
-}

frontend

@@ -1 +1 @@
-Subproject commit 73080fb56d24a57005d8c4e415249693aa615aca
+Subproject commit 14a936a2932d342b9dbc162de1cde9a38036b3d2

wizard.sh

@@ -87,6 +87,7 @@ buildAssets () {
   yarn install
   yarn build
 
+  echo "Run rice"
   cd $REPO/http
   rice embed-go
 }
@@ -110,16 +111,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 "\
+    $(command -v winpty) docker run --rm -itv "/$(pwd)://src" -w "//src" filebrowser/dev sh -c "\
-      GO111MODULE=on go get -v ./... && \
+      go get -v ./... && \
-      GO111MODULE=on go mod vendor && \
+      golangci-lint run -v"
-      GO111MODULE=off $dolint"
   else
-    $dolint
+    golangci-lint run -v
   fi
 }
 
@@ -180,6 +178,10 @@ build () {
       rm -rf frontend/dist
     fi;
 
+    if [ -f "http/rice-box.go" ]; then
+      rm -f http/rice-box.go
+    fi;
+
     if [ "$(command -v git)" != "" ]; then
       COMMIT_SHA="$(git rev-parse HEAD | cut -c1-8)"
     else
@@ -187,11 +189,14 @@ build () {
     fi
 
     $(command -v winpty) docker run --rm -it \
+      -u "$(id -u)" \
       -v /$(pwd):/src:z \
       -w //src \
       -e COMMIT_SHA=$COMMIT_SHA \
+      -e HOME="//tmp" \
+      -e GOPATH=//tmp/gopath \
       filebrowser/dev \
-      sh -c "dos2unix wizard.sh && ./wizard.sh -b"
+      sh -c "./wizard.sh -b"
 
   else
     buildAssets