From d980e00961e64c12c28fe6adb209a6c0a652efd1 Mon Sep 17 00:00:00 2001 From: Junegunn Choi Date: Sat, 19 Sep 2015 22:51:12 +0900 Subject: [PATCH] Revert "Revert "0.10.6"" This reverts commit 987799f8fbd2367fe99383a1ddf9ddf5d4ed253f. --- CHANGELOG.md | 5 ++++- install | 11 +++-------- man/man1/fzf.1 | 2 +- src/constants.go | 2 +- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f10cbca..0018b9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,10 @@ CHANGELOG - Changed exit status - 0: Okay - 1: No match - - 2: Error/Interrupted + - 2: Error + - 130: Interrupted +- 64-bit linux binary is statically-linked with ncurses to avoid + compatibility issues. 0.10.5 ------ diff --git a/install b/install index 9b9b04d..51b56ec 100755 --- a/install +++ b/install @@ -1,7 +1,7 @@ #!/usr/bin/env bash -[[ "$@" =~ --pre ]] && version=0.10.5 pre=1 || - version=0.10.5 pre=0 +[[ "$@" =~ --pre ]] && version=0.10.6 pre=1 || + version=0.10.6 pre=0 cd $(dirname $BASH_SOURCE) fzf_base=$(pwd) @@ -80,12 +80,7 @@ download() { return fi - chmod +x $1 && symlink $1 || return 1 - if [[ $1 =~ linux_amd64$ ]]; then - check_binary || download $1-static - else - check_binary - fi + chmod +x $1 && symlink $1 && check_binary } # Try to download binary executable diff --git a/man/man1/fzf.1 b/man/man1/fzf.1 index 4147371..99d40ff 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 "Sep 2015" "fzf 0.10.5" "fzf - a command-line fuzzy finder" +.TH fzf 1 "Sep 2015" "fzf 0.10.6" "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 1cc4f81..7deb078 100644 --- a/src/constants.go +++ b/src/constants.go @@ -8,7 +8,7 @@ import ( const ( // Current version - version = "0.10.5" + version = "0.10.6" // Core coordinatorDelayMax time.Duration = 100 * time.Millisecond