From c3676bf986c3f901c3b799735713d57b0341e167 Mon Sep 17 00:00:00 2001 From: Junegunn Choi Date: Wed, 29 Jan 2014 11:04:07 +0900 Subject: [PATCH 1/2] Make install script prefer system ruby --- install | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/install b/install index 970b15a9..0cfd7b37 100755 --- a/install +++ b/install @@ -10,11 +10,20 @@ if [ $? -ne 0 ]; then echo "ruby executable not found!" exit 1 fi -echo "OK" + +# System ruby is preferred +curses_check="begin; require 'curses'; rescue Exception; exit 1; end" +system_ruby=/usr/bin/ruby +if [ -x $system_ruby -a $system_ruby != "$ruby" ]; then + $system_ruby --disable-gems -e "$curses_check" 2> /dev/null + [ $? -eq 0 ] && ruby=$system_ruby +fi + +echo "OK ($ruby)" # Curses-support echo -n "Checking Curses support ... " -/usr/bin/env ruby -e "begin; require 'curses'; rescue Exception; exit 1; end" +"$ruby" -e "$curses_check" if [ $? -eq 0 ]; then echo "OK" else @@ -30,10 +39,10 @@ fi # Ruby version echo -n "Checking Ruby version ... " -/usr/bin/env ruby -e 'exit RUBY_VERSION >= "1.9"' +"$ruby" -e 'exit RUBY_VERSION >= "1.9"' if [ $? -eq 0 ]; then echo ">= 1.9" - /usr/bin/env ruby --disable-gems -e "begin; require 'curses'; rescue Exception; exit 1; end" + "$ruby" --disable-gems -e "$curses_check" if [ $? -eq 0 ]; then fzf_cmd="$ruby --disable-gems $fzf_base/fzf" else From c2943e7681767b75193657fbdcf2a378f588c38e Mon Sep 17 00:00:00 2001 From: Junegunn Choi Date: Thu, 30 Jan 2014 03:12:12 +0900 Subject: [PATCH 2/2] Fix `incompatible encoding regexp match` from width call --- fzf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fzf b/fzf index aa6e81e1..5decd48d 100755 --- a/fzf +++ b/fzf @@ -421,7 +421,7 @@ class FZF if RUBY_VERSION.split('.').map { |e| e.rjust(3, '0') }.join > '001009' @@wrx = Regexp.new '\p{Han}|\p{Katakana}|\p{Hiragana}|\p{Hangul}' def width str - str.gsub(@@wrx, ' ').length + str.gsub(@@wrx, ' ').length rescue str.length end def trim str, len, left