summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunegunn Choi <junegunn.c@gmail.com>2020-10-27 01:46:43 +0900
committerJunegunn Choi <junegunn.c@gmail.com>2020-10-27 11:07:27 +0900
commit552414978ed74e7cd77bd57874f6fbbe3e0024c4 (patch)
treeffb8cb0796983c6e56c4f47a3216697386f3482e
parent607081bbaab228f41ebfe1f7aa0e993ab134c205 (diff)
0.24.0-rc10.24.0-rc1
-rw-r--r--.gitignore3
-rw-r--r--.gon.hcl11
-rw-r--r--.goreleaser.yml69
-rw-r--r--CHANGELOG.md2
-rw-r--r--Makefile45
-rw-r--r--README.md2
-rw-r--r--go.mod12
-rw-r--r--go.sum38
-rwxr-xr-xinstall49
-rw-r--r--install.ps118
-rw-r--r--main.go3
-rw-r--r--man/man1/fzf-tmux.12
-rw-r--r--man/man1/fzf.12
-rw-r--r--src/constants.go3
-rw-r--r--src/core.go2
-rwxr-xr-xsrc/update_assets.rb47
16 files changed, 144 insertions, 164 deletions
diff --git a/.gitignore b/.gitignore
index b76a3f1a..8bde085a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
bin/fzf
bin/fzf.exe
+dist
target
pkg
Gemfile.lock
@@ -9,3 +10,5 @@ vendor
gopath
*.zwc
fzf
+tmp
+*.patch
diff --git a/.gon.hcl b/.gon.hcl
new file mode 100644
index 00000000..459ca4da
--- /dev/null
+++ b/.gon.hcl
@@ -0,0 +1,11 @@
+source = ["./dist/fzf-macos_darwin_amd64/fzf"]
+bundle_id = "kr.junegunn.fzf"
+
+apple_id {
+ username = "junegunn.c@gmail.com"
+ password = "@env:AC_PASSWORD"
+}
+
+sign {
+ application_identity = "Apple Development: junegunn.c@gmail.com"
+}
diff --git a/.goreleaser.yml b/.goreleaser.yml
new file mode 100644
index 00000000..57e3b287
--- /dev/null
+++ b/.goreleaser.yml
@@ -0,0 +1,69 @@
+---
+project_name: fzf
+
+before:
+ hooks:
+ - go mod download
+
+builds:
+ - id: fzf-macos
+ binary: fzf
+ goos:
+ - darwin
+ goarch:
+ - amd64
+ ldflags:
+ - "-s -w -X main.version={{ .Version }} -X main.revision={{ .ShortCommit }}"
+ hooks:
+ post: gon .gon.hcl
+
+ - goos:
+ - linux
+ - windows
+ - freebsd
+ - openbsd
+ goarch:
+ - amd64
+ - arm
+ - arm64
+ goarm:
+ - 5
+ - 6
+ - 7
+ ldflags:
+ - "-s -w -X main.version={{ .Version }} -X main.revision={{ .ShortCommit }}"
+ ignore:
+ - goos: freebsd
+ goarch: arm
+ - goos: openbsd
+ goarch: arm
+ - goos: freebsd
+ goarch: arm64
+ - goos: openbsd
+ goarch: arm64
+
+archives:
+ - name_template: "{{ .ProjectName }}-{{ .Version }}-{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
+ format: tar.gz
+ format_overrides:
+ - goos: windows
+ format: zip
+ files:
+ - non-existent*
+
+release:
+ github:
+ owner: junegunn
+ name: fzf
+ prerelease: auto
+ name_template: '{{ .Tag }}'
+
+snapshot:
+ name_template: "{{ .Tag }}-devel"
+
+changelog:
+ sort: asc
+ filters:
+ exclude:
+ - README
+ - test
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed6c9ce9..626105cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,7 +23,7 @@ CHANGELOG
# * Italic style may not be supported by some terminals
rg --line-number --no-heading --color=always "" |
fzf --ansi --prompt "Rg: " \
- --color fg+:italic,hl:underline:-1,hl+:underline:reverse:-1 \
+ --color fg+:italic,hl:underline:-1,hl+:italic:underline:reverse:-1 \
--color pointer:reverse,prompt:reverse,input:159 \
--pointer ' '
```
diff --git a/Makefile b/Makefile
index 54fce67c..5b0a278e 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,9 @@ MAKEFILE := $(realpath $(lastword $(MAKEFILE_LIST)))
ROOT_DIR := $(shell dirname $(MAKEFILE))
SOURCES := $(wildcard *.go src/*.go src/*/*.go) $(MAKEFILE)
+VERSION := $(shell git describe --abbrev=0)
REVISION := $(shell git log -n 1 --pretty=format:%h -- $(SOURCES))
-BUILD_FLAGS := -a -ldflags "-X main.revision=$(REVISION) -w '-extldflags=$(LDFLAGS)'" -tags "$(TAGS)"
+BUILD_FLAGS := -a -ldflags "-X main.version=$(VERSION) -X main.revision=$(REVISION) -w '-extldflags=$(LDFLAGS)'" -tags "$(TAGS)"
BINARY64 := fzf-$(GOOS)_amd64
BINARYARM5 := fzf-$(GOOS)_arm5
@@ -15,12 +16,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 "\" ")
-RELEASE64 := fzf-$(VERSION)-$(GOOS)_amd64
-RELEASEARM5 := fzf-$(VERSION)-$(GOOS)_arm5
-RELEASEARM6 := fzf-$(VERSION)-$(GOOS)_arm6
-RELEASEARM7 := fzf-$(VERSION)-$(GOOS)_arm7
-RELEASEARM8 := fzf-$(VERSION)-$(GOOS)_arm8
-RELEASEPPC64LE := fzf-$(VERSION)-$(GOOS)_ppc64le
# https://en.wikipedia.org/wiki/Uname
UNAME_M := $(shell uname -m)
@@ -46,35 +41,6 @@ endif
all: target/$(BINARY)
-target:
- mkdir -p $@
-
-ifeq ($(GOOS),windows)
-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/$(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
- cd target && cp -f $(BINARYARM7) fzf && tar -czf $(RELEASEARM7).tgz fzf
- cd target && cp -f $(BINARYARM8) fzf && tar -czf $(RELEASEARM8).tgz fzf
- cd target && cp -f $(BINARYPPC64LE) fzf && tar -czf $(RELEASEPPC64LE).tgz fzf
- cd target && rm -f fzf
-else
-release: target/$(BINARY64)
- cd target && cp -f $(BINARY64) fzf && tar -czf $(RELEASE64).tgz fzf
- cd target && rm -f fzf
-endif
-
-release-all: clean test
- GOOS=darwin make release
- GOOS=linux make release
- GOOS=freebsd make release
- GOOS=openbsd make release
- GOOS=windows make release
-
test: $(SOURCES)
SHELL=/bin/sh GOOS= $(GO) test -v -tags "$(TAGS)" \
github.com/junegunn/fzf/src \
@@ -84,8 +50,11 @@ test: $(SOURCES)
install: bin/fzf
+release:
+ goreleaser --rm-dist --snapshot
+
clean:
- $(RM) -r target
+ $(RM) -r dist target
target/$(BINARY64): $(SOURCES)
GOARCH=amd64 $(GO) build $(BUILD_FLAGS) -o $@
@@ -121,4 +90,4 @@ update:
$(GO) get -u
$(GO) mod tidy
-.PHONY: all release release-all test install clean docker docker-test update
+.PHONY: all release test install clean docker docker-test update
diff --git a/README.md b/README.md
index de186a3a..8bfa884e 100644
--- a/README.md
+++ b/README.md
@@ -82,7 +82,7 @@ fzf project consists of the following components:
You can [download fzf executable][bin] alone if you don't need the extra
stuff.
-[bin]: https://github.com/junegunn/fzf-bin/releases
+[bin]: https://github.com/junegunn/fzf/releases
### Using Homebrew or Linuxbrew
diff --git a/go.mod b/go.mod
index 7c6a5226..03e77826 100644
--- a/go.mod
+++ b/go.mod
@@ -2,14 +2,14 @@ module github.com/junegunn/fzf
require (
github.com/gdamore/tcell v1.4.0
- github.com/lucasb-eyer/go-colorful v1.0.3 // indirect
github.com/mattn/go-isatty v0.0.12
github.com/mattn/go-runewidth v0.0.9
- github.com/mattn/go-shellwords v1.0.9
- github.com/saracen/walker v0.0.0-20191201085201-324a081bae7e
- golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d
- golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5
- golang.org/x/text v0.3.2 // indirect
+ github.com/mattn/go-shellwords v1.0.10
+ github.com/saracen/walker v0.1.1
+ golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
+ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect
+ golang.org/x/sys v0.0.0-20201026173827-119d4633e4d1
+ golang.org/x/text v0.3.3 // indirect
)
go 1.13
diff --git a/go.sum b/go.sum
index 01e1e589..4fcf318a 100644
--- a/go.sum
+++ b/go.sum
@@ -1,47 +1,35 @@
-github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko=
github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
github.com/gdamore/tcell v1.4.0 h1:vUnHwJRvcPQa3tzi+0QI4U9JINXYJlOz9yiaiPQ2wMU=
github.com/gdamore/tcell v1.4.0/go.mod h1:vxEiSDZdW3L+Uhjii9c3375IlDmR05bzxY404ZVSMo0=
-github.com/lucasb-eyer/go-colorful v1.0.2 h1:mCMFu6PgSozg9tDNMMK3g18oJBX7oYGrC09mS6CXfO4=
-github.com/lucasb-eyer/go-colorful v1.0.2/go.mod h1:0MS4r+7BZKSJ5mw4/S5MPN+qHFF1fYclkSPilDOKW0s=
github.com/lucasb-eyer/go-colorful v1.0.3 h1:QIbQXiugsb+q10B+MI+7DI1oQLdmnep86tWFlaaUAac=
github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y=
-github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
-github.com/mattn/go-runewidth v0.0.8 h1:3tS41NlGYSmhhe/8fhGRzc+z3AYCw1Fe1WAyLuujKs0=
-github.com/mattn/go-runewidth v0.0.8/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
-github.com/mattn/go-shellwords v1.0.9 h1:eaB5JspOwiKKcHdqcjbfe5lA9cNn/4NRRtddXJCimqk=
-github.com/mattn/go-shellwords v1.0.9/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
-github.com/saracen/walker v0.0.0-20191201085201-324a081bae7e h1:NO86zOn5ScSKW8wRbMaSIcjDZUFpWdCQQnexRqZ9h9A=
-github.com/saracen/walker v0.0.0-20191201085201-324a081bae7e/go.mod h1:G0Z6yVPru183i2MuRJx1DcR4dgIZtLcTdaaE/pC1BJU=
+github.com/mattn/go-shellwords v1.0.10 h1:Y7Xqm8piKOO3v10Thp7Z36h4FYFjt5xB//6XvOrs2Gw=
+github.com/mattn/go-shellwords v1.0.10/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
+github.com/saracen/walker v0.1.1 h1:Ou2QIKTWqo0QxhtuHVmtObbmhjMCEUyJ82xp0uV+MGI=
+github.com/saracen/walker v0.1.1/go.mod h1:0oKYMsKVhSJ+ful4p/XbjvXbMgLEkLITZaxozsl4CGE=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d h1:9FCpayM9Egr1baVnV1SX0H87m+XB0B8S0hAMi99X/3U=
-golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 h1:pLI5jrR7OSLijeIDcmRxNmw2api+jEfxLoykJVice/E=
+golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756 h1:9nuHUbU8dRnRRfj9KjWUVrJeoexdbeMjttk6Oh1rD10=
golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 h1:LfCXLvNmTYH9kEmVgqbnsWfruoXZIrh4YBgqVHtDvw0=
-golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201026173827-119d4633e4d1 h1:/DtoiOYKoQCcIFXQjz07RnWNPRCbqmSXSpgEzhC9ZHM=
+golang.org/x/sys v0.0.0-20201026173827-119d4633e4d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191011211836-4c025a95b26e h1:1o2bDs9pCd2xFhdwqJTrCIswAeEsn4h/PCNelWpfcsI=
-golang.org/x/tools v0.0.0-20191011211836-4c025a95b26e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/install b/install
index 75ca5e96..e7049093 100755
--- a/install
+++ b/install
@@ -2,11 +2,10 @@
set -u
-version=0.23.1
+version=0.24.0-rc1
auto_completion=
key_bindings=
update_config=2
-binary_arch=
shells="bash zsh fish"
prefix='~/.fzf'
prefix_expand=~/.fzf
@@ -115,7 +114,7 @@ link_fzf_in_path() {
try_curl() {
command -v curl > /dev/null &&
- if [[ $1 =~ tgz$ ]]; then
+ if [[ $1 =~ tar.gz$ ]]; then
curl -fL $1 | tar -xzf -
else
local temp=${TMPDIR:-/tmp}/fzf.zip
@@ -125,7 +124,7 @@ try_curl() {
try_wget() {
command -v wget > /dev/null &&
- if [[ $1 =~ tgz$ ]]; then
+ if [[ $1 =~ tar.gz$ ]]; then
wget -O - $1 | tar -xzf -
else
local temp=${TMPDIR:-/tmp}/fzf.zip
@@ -135,13 +134,11 @@ try_wget() {
download() {
echo "Downloading bin/fzf ..."
- if [[ ! "$version" =~ alpha ]]; then
- if [ -x "$fzf_base"/bin/fzf ]; then
- echo " - Already exists"
- check_binary && return
- fi
- link_fzf_in_path && return
+ if [ -x "$fzf_base"/bin/fzf ]; then
+ echo " - Already exists"
+ check_binary && return
fi
+ link_fzf_in_path && return
mkdir -p "$fzf_base"/bin && cd "$fzf_base"/bin
if [ $? -ne 0 ]; then
binary_error="Failed to create bin directory"
@@ -149,9 +146,7 @@ download() {
fi
local url
- [[ "$version" =~ alpha ]] &&
- url=https://github.com/junegunn/fzf-bin/releases/download/alpha/${1} ||
- url=https://github.com/junegunn/fzf-bin/releases/download/$version/${1}
+ url=https://github.com/junegunn/fzf/releases/download/$version/${1}
set -o pipefail
if ! (try_curl $url || try_wget $url); then
set +o pipefail
@@ -173,20 +168,20 @@ archi=$(uname -sm)
binary_available=1
binary_error=""
case "$archi" in
- Darwin\ *64) download fzf-$version-darwin_${binary_arch:-amd64}.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 ;;
- FreeBSD\ *64) download fzf-$version-freebsd_${binary_arch:-amd64}.tgz ;;
- OpenBSD\ *64) download fzf-$version-openbsd_${binary_arch:-amd64}.tgz ;;
- CYGWIN*\ *64) download fzf-$version-windows_${binary_arch:-amd64}.zip ;;
- MINGW*\ *64) download fzf-$version-windows_${binary_arch:-amd64}.zip ;;
- MSYS*\ *64) download fzf-$version-windows_${binary_arch:-amd64}.zip ;;
- Windows*\ *64) download fzf-$version-windows_${binary_arch:-amd64}.zip ;;
- *) binary_available=0 binary_error=1 ;;
+ Darwin\ *64) download fzf-$version-darwin_amd64.tar.gz ;;
+ Linux\ armv5*) download fzf-$version-linux_armv5.tar.gz ;;
+ Linux\ armv6*) download fzf-$version-linux_armv6.tar.gz ;;
+ Linux\ armv7*) download fzf-$version-linux_armv7.tar.gz ;;
+ Linux\ armv8*) download fzf-$version-linux_arm64.tar.gz ;;
+ Linux\ aarch64*) download fzf-$version-linux_arm64.tar.gz ;;
+ Linux\ *64) download fzf-$version-linux_amd64.tar.gz ;;
+ FreeBSD\ *64) download fzf-$version-freebsd_amd64.tar.gz ;;
+ OpenBSD\ *64) download fzf-$version-openbsd_amd64.tar.gz ;;
+ CYGWIN*\ *64) download fzf-$version-windows_amd64.zip ;;
+ MINGW*\ *64) download fzf-$version-windows_amd64.zip ;;
+ MSYS*\ *64) download fzf-$version-windows_amd64.zip ;;
+ Windows*\ *64) download fzf-$version-windows_amd64.zip ;;
+ *) binary_available=0 binary_error=1 ;;
esac
cd "$fzf_base"
diff --git a/install.ps1 b/install.ps1
index 773421fe..855a6f34 100644
--- a/install.ps1
+++ b/install.ps1
@@ -1,4 +1,4 @@
-$version="0.23.1"
+$version="0.24.0-rc1"
$fzf_base=Split-Path -Parent $MyInvocation.MyCommand.Definition
@@ -26,12 +26,10 @@ function check_binary () {
function download {
param($file)
Write-Host "Downloading bin/fzf ..."
- if ("$version" -ne "alpha") {
- if (Test-Path "$fzf_base\bin\fzf.exe") {
- Write-Host " - Already exists"
- if (check_binary) {
- return
- }
+ if (Test-Path "$fzf_base\bin\fzf.exe") {
+ Write-Host " - Already exists"
+ if (check_binary) {
+ return
}
}
if (-not (Test-Path "$fzf_base\bin")) {
@@ -42,11 +40,7 @@ function download {
return
}
cd "$fzf_base\bin"
- if ("$version" -eq "alpha") {
- $url="https://github.com/junegunn/fzf-bin/releases/download/alpha/$file"
- } else {
- $url="https://github.com/junegunn/fzf-bin/releases/download/$version/$file"
- }
+ $url="https://github.com/junegunn/fzf/releases/download/$version/$file"
$temp=$env:TMP + "\fzf.zip"
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
(New-Object Net.WebClient).DownloadFile($url, $ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath("$temp"))
diff --git a/main.go b/main.go
index f444f8be..d73ab889 100644
--- a/main.go
+++ b/main.go
@@ -5,9 +5,10 @@ import (
"github.com/junegunn/fzf/src/protector"
)
+var version string
var revision string
func main() {
protector.Protect()
- fzf.Run(fzf.ParseOptions(), revision)
+ fzf.Run(fzf.ParseOptions(), version, revision)
}
diff --git a/man/man1/fzf-tmux.1 b/man/man1/fzf-tmux.1
index 1775d2e7..9cf55941 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 "Oct 2020" "fzf 0.23.1" "fzf-tmux - open fzf in tmux split pane"
+.TH fzf-tmux 1 "Oct 2020" "fzf 0.24.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 9f2051ff..ce8c6319 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 "Oct 2020" "fzf 0.23.1" "fzf - a command-line fuzzy finder"
+.TH fzf 1 "Oct 2020" "fzf 0.24.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 ca181ed0..9842e0bf 100644
--- a/src/constants.go
+++ b/src/constants.go
@@ -9,9 +9,6 @@ import (
)
const (
- // Current version
- version = "0.24.0"
-
// Core
coordinatorDelayMax time.Duration = 100 * time.Millisecond
coordinatorDelayStep time.Duration = 10 * time.Millisecond
diff --git a/src/core.go b/src/core.go
index bd45df69..ef470a80 100644
--- a/src/core.go
+++ b/src/core.go
@@ -43,7 +43,7 @@ Matcher -> EvtHeader -> Terminal (update header)
*/
// Run starts fzf
-func Run(opts *Options, revision string) {
+func Run(opts *Options, version string, revision string) {
sort := opts.Sort > 0
sortCriteria = opts.Criteria
diff --git a/src/update_assets.rb b/src/update_assets.rb
deleted file mode 100755
index 531a8eeb..00000000
--- a/src/update_assets.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-# http://www.rubydoc.info/github/rest-client/rest-client/RestClient
-require 'rest_client'
-require 'json'
-
-if ARGV.length < 3
- puts "usage: #{$PROGRAM_NAME} <token> <version> <files...>"
- exit 1
-end
-
-token, version, *files = ARGV
-base = 'https://api.github.com/repos/junegunn/fzf-bin/releases'
-
-# List releases
-rels = JSON.parse(RestClient.get(base, authorization: "token #{token}"))
-rel = rels.find { |r| r['tag_name'] == version }
-unless rel
- puts "#{version} not found"
- exit 1
-end
-
-# List assets
-assets = Hash[rel['assets'].map { |a| a.values_at('name', 'id') }]
-
-files.select { |f| File.exist?(f) }.map do |file|
- Thread.new do
- name = File.basename(file)
-
- if asset_id = assets[name] # rubocop:todo Lint/AssignmentInCondition
- puts "#{name} found. Deleting asset id #{asset_id}."
- RestClient.delete("#{base}/assets/#{asset_id}",
- authorization: "token #{token}")
- else
- puts "#{name} not found"
- end
-
- puts "Uploading #{name}"
- RestClient.post(
- "#{base.sub('api', 'uploads')}/#{rel['id']}/assets?name=#{name}",
- File.read(file),
- authorization: "token #{token}",
- content_type: 'application/octet-stream'
- )
- end
-end.each(&:join)