From dba14d26303297322dc4426d38ebfbf1d76a6011 Mon Sep 17 00:00:00 2001 From: Junegunn Choi Date: Wed, 7 Oct 2020 19:07:09 +0900 Subject: [PATCH] 0.23.0 --- CHANGELOG.md | 4 +++- Makefile | 18 +++--------------- install | 14 +------------- install.ps1 | 2 +- man/man1/fzf-tmux.1 | 2 +- man/man1/fzf.1 | 2 +- src/constants.go | 2 +- 7 files changed, 11 insertions(+), 33 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a928aa2..97d877d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ CHANGELOG ========= -0.22.1 +0.23.0 ------ - Support preview scroll offset relative to window height ```sh @@ -22,6 +22,8 @@ CHANGELOG - Added `fzf#exec()` function for getting the path of fzf executable - It also downloads the latest binary if it's not available by running `./install --bin` +- Built with Go 1.15.2 + - We no longer provide 32-bit binaries 0.22.0 ------ diff --git a/Makefile b/Makefile index 60283d00..54fce67c 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,6 @@ SOURCES := $(wildcard *.go src/*.go src/*/*.go) $(MAKEFILE) REVISION := $(shell git log -n 1 --pretty=format:%h -- $(SOURCES)) BUILD_FLAGS := -a -ldflags "-X main.revision=$(REVISION) -w '-extldflags=$(LDFLAGS)'" -tags "$(TAGS)" -BINARY32 := fzf-$(GOOS)_386 BINARY64 := fzf-$(GOOS)_amd64 BINARYARM5 := fzf-$(GOOS)_arm5 BINARYARM6 := fzf-$(GOOS)_arm6 @@ -16,7 +15,6 @@ BINARYARM7 := fzf-$(GOOS)_arm7 BINARYARM8 := fzf-$(GOOS)_arm8 BINARYPPC64LE := fzf-$(GOOS)_ppc64le VERSION := $(shell awk -F= '/version =/ {print $$2}' src/constants.go | tr -d "\" ") -RELEASE32 := fzf-$(VERSION)-$(GOOS)_386 RELEASE64 := fzf-$(VERSION)-$(GOOS)_amd64 RELEASEARM5 := fzf-$(VERSION)-$(GOOS)_arm5 RELEASEARM6 := fzf-$(VERSION)-$(GOOS)_arm6 @@ -30,10 +28,6 @@ ifeq ($(UNAME_M),x86_64) BINARY := $(BINARY64) else ifeq ($(UNAME_M),amd64) BINARY := $(BINARY64) -else ifeq ($(UNAME_M),i686) - BINARY := $(BINARY32) -else ifeq ($(UNAME_M),i386) - BINARY := $(BINARY32) else ifeq ($(UNAME_M),armv5l) BINARY := $(BINARYARM5) else ifeq ($(UNAME_M),armv6l) @@ -56,13 +50,11 @@ target: mkdir -p $@ ifeq ($(GOOS),windows) -release: target/$(BINARY32) target/$(BINARY64) - cd target && cp -f $(BINARY32) fzf.exe && zip $(RELEASE32).zip fzf.exe +release: target/$(BINARY64) cd target && cp -f $(BINARY64) fzf.exe && zip $(RELEASE64).zip fzf.exe cd target && rm -f fzf.exe else ifeq ($(GOOS),linux) -release: target/$(BINARY32) target/$(BINARY64) target/$(BINARYARM5) target/$(BINARYARM6) target/$(BINARYARM7) target/$(BINARYARM8) target/$(BINARYPPC64LE) - cd target && cp -f $(BINARY32) fzf && tar -czf $(RELEASE32).tgz fzf +release: target/$(BINARY64) target/$(BINARYARM5) target/$(BINARYARM6) target/$(BINARYARM7) target/$(BINARYARM8) target/$(BINARYPPC64LE) cd target && cp -f $(BINARY64) fzf && tar -czf $(RELEASE64).tgz fzf cd target && cp -f $(BINARYARM5) fzf && tar -czf $(RELEASEARM5).tgz fzf cd target && cp -f $(BINARYARM6) fzf && tar -czf $(RELEASEARM6).tgz fzf @@ -71,8 +63,7 @@ release: target/$(BINARY32) target/$(BINARY64) target/$(BINARYARM5) target/$(BIN cd target && cp -f $(BINARYPPC64LE) fzf && tar -czf $(RELEASEPPC64LE).tgz fzf cd target && rm -f fzf else -release: target/$(BINARY32) target/$(BINARY64) - cd target && cp -f $(BINARY32) fzf && tar -czf $(RELEASE32).tgz fzf +release: target/$(BINARY64) cd target && cp -f $(BINARY64) fzf && tar -czf $(RELEASE64).tgz fzf cd target && rm -f fzf endif @@ -96,9 +87,6 @@ install: bin/fzf clean: $(RM) -r target -target/$(BINARY32): $(SOURCES) - GOARCH=386 $(GO) build $(BUILD_FLAGS) -o $@ - target/$(BINARY64): $(SOURCES) GOARCH=amd64 $(GO) build $(BUILD_FLAGS) -o $@ diff --git a/install b/install index 040b0b31..2bfd552e 100755 --- a/install +++ b/install @@ -2,7 +2,7 @@ set -u -version=0.22.0 +version=0.23.0 auto_completion= key_bindings= update_config=2 @@ -28,9 +28,6 @@ usage: $0 [OPTIONS] --no-bash Do not set up bash configuration --no-zsh Do not set up zsh configuration --no-fish Do not set up fish configuration - - --32 Download 32-bit binary - --64 Download 64-bit binary EOF } @@ -56,8 +53,6 @@ for opt in "$@"; do --no-completion) auto_completion=0 ;; --update-rc) update_config=1 ;; --no-update-rc) update_config=0 ;; - --32) binary_arch=386 ;; - --64) binary_arch=amd64 ;; --bin) ;; --no-bash) shells=${shells/bash/} ;; --no-zsh) shells=${shells/zsh/} ;; @@ -179,24 +174,17 @@ binary_available=1 binary_error="" case "$archi" in Darwin\ *64) download fzf-$version-darwin_${binary_arch:-amd64}.tgz ;; - Darwin\ *86) download fzf-$version-darwin_${binary_arch:-386}.tgz ;; Linux\ armv5*) download fzf-$version-linux_${binary_arch:-arm5}.tgz ;; Linux\ armv6*) download fzf-$version-linux_${binary_arch:-arm6}.tgz ;; Linux\ armv7*) download fzf-$version-linux_${binary_arch:-arm7}.tgz ;; Linux\ armv8*) download fzf-$version-linux_${binary_arch:-arm8}.tgz ;; Linux\ aarch64*) download fzf-$version-linux_${binary_arch:-arm8}.tgz ;; Linux\ *64) download fzf-$version-linux_${binary_arch:-amd64}.tgz ;; - Linux\ *86) download fzf-$version-linux_${binary_arch:-386}.tgz ;; FreeBSD\ *64) download fzf-$version-freebsd_${binary_arch:-amd64}.tgz ;; - FreeBSD\ *86) download fzf-$version-freebsd_${binary_arch:-386}.tgz ;; OpenBSD\ *64) download fzf-$version-openbsd_${binary_arch:-amd64}.tgz ;; - OpenBSD\ *86) download fzf-$version-openbsd_${binary_arch:-386}.tgz ;; CYGWIN*\ *64) download fzf-$version-windows_${binary_arch:-amd64}.zip ;; - MINGW*\ *86) download fzf-$version-windows_${binary_arch:-386}.zip ;; MINGW*\ *64) download fzf-$version-windows_${binary_arch:-amd64}.zip ;; - MSYS*\ *86) download fzf-$version-windows_${binary_arch:-386}.zip ;; MSYS*\ *64) download fzf-$version-windows_${binary_arch:-amd64}.zip ;; - Windows*\ *86) download fzf-$version-windows_${binary_arch:-386}.zip ;; Windows*\ *64) download fzf-$version-windows_${binary_arch:-amd64}.zip ;; *) binary_available=0 binary_error=1 ;; esac diff --git a/install.ps1 b/install.ps1 index 80c5b6fe..d9ff77e8 100644 --- a/install.ps1 +++ b/install.ps1 @@ -1,4 +1,4 @@ -$version="0.22.0" +$version="0.23.0" if ([Environment]::Is64BitProcess) { $binary_arch="amd64" diff --git a/man/man1/fzf-tmux.1 b/man/man1/fzf-tmux.1 index 060f3aa1..a13ef8d4 100644 --- a/man/man1/fzf-tmux.1 +++ b/man/man1/fzf-tmux.1 @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. .. -.TH fzf-tmux 1 "Aug 2020" "fzf 0.22.0" "fzf-tmux - open fzf in tmux split pane" +.TH fzf-tmux 1 "Oct 2020" "fzf 0.23.0" "fzf-tmux - open fzf in tmux split pane" .SH NAME fzf-tmux - open fzf in tmux split pane diff --git a/man/man1/fzf.1 b/man/man1/fzf.1 index 7fbc931a..cfa4adb6 100644 --- a/man/man1/fzf.1 +++ b/man/man1/fzf.1 @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. .. -.TH fzf 1 "Aug 2020" "fzf 0.22.0" "fzf - a command-line fuzzy finder" +.TH fzf 1 "Oct 2020" "fzf 0.23.0" "fzf - a command-line fuzzy finder" .SH NAME fzf - a command-line fuzzy finder diff --git a/src/constants.go b/src/constants.go index b00b44ac..a43a407c 100644 --- a/src/constants.go +++ b/src/constants.go @@ -10,7 +10,7 @@ import ( const ( // Current version - version = "0.22.0" + version = "0.23.0" // Core coordinatorDelayMax time.Duration = 100 * time.Millisecond