diff --git a/Makefile b/Makefile index 9977f47f..f9f41d2c 100644 --- a/Makefile +++ b/Makefile @@ -94,6 +94,6 @@ help: @sed -n 's/^## //p' $(MAKEFILE_LIST) | column -t -s ':' | sed -e 's/^/ /' | sort .PHONY: build-release-bin -build-release-bin: +build-release-bin: build-frontend GO111MODULE=on GOOS=linux GOARCH=amd64 $(GO) build -ldflags '$(LDFLAGS)' -o bin/filebrowser-$(VERSION) tar -C bin -czf "dist/filebrowser-$(VERSION).tar.gz" "filebrowser-$(VERSION)" diff --git a/files/listing.go b/files/listing.go index a511696c..7c064fac 100644 --- a/files/listing.go +++ b/files/listing.go @@ -110,7 +110,7 @@ func (l byModified) Less(i, j int) bool { } func (l *Listing) FilterItems(fn func(fi *FileInfo) bool) { - var filtered []*FileInfo + filtered := []*FileInfo{} for _, item := range l.Items { if fn(item) { filtered = append(filtered, item) diff --git a/http/resource.go b/http/resource.go index 7472b0dc..d9596f47 100644 --- a/http/resource.go +++ b/http/resource.go @@ -229,7 +229,8 @@ func resourcePatchHandler(fileCache FileCache) handleFunc { override := r.URL.Query().Get("override") == "true" rename := r.URL.Query().Get("rename") == "true" - if !override && !rename { + unarchive := r.URL.Query().Get("action") == "unarchive" + if !override && !rename && !unarchive { if _, err = d.user.Fs.Stat(dst); err == nil { return http.StatusConflict, nil }