Llewellyn/fzf
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/fzf.git synced 2025-01-03 15:17:25 +00:00
Code Issues Projects Releases Wiki Activity

Simpler check for curses

Browse Source
This commit is contained in:
Junegunn Choi 2014-05-02 04:51:35 +09:00
parent 5d6ed935a4
commit 89eb1575e7
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
install
View File

@ -12,10 +12,9 @@ if [ $? -ne 0 ]; then
fi fi
# System ruby is preferred # System ruby is preferred
curses_check="begin; require 'curses'; rescue Exception; exit 1; end"
system_ruby=/usr/bin/ruby system_ruby=/usr/bin/ruby
if [ -x $system_ruby -a $system_ruby != "$ruby" ]; then if [ -x $system_ruby -a $system_ruby != "$ruby" ]; then
$system_ruby --disable-gems -e "$curses_check" 2> /dev/null $system_ruby --disable-gems -rcurses -e0 2> /dev/null
[ $? -eq 0 ] && ruby=$system_ruby [ $? -eq 0 ] && ruby=$system_ruby
fi fi
@ -23,7 +22,7 @@ echo "OK ($ruby)"
# Curses-support # Curses-support
echo -n "Checking Curses support ... " echo -n "Checking Curses support ... "
"$ruby" -e "$curses_check" "$ruby" -rcurses -e0 2> /dev/null
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "OK" echo "OK"
else else
@ -45,7 +44,7 @@ echo -n "Checking Ruby version ... "
"$ruby" -e 'exit RUBY_VERSION >= "1.9"' "$ruby" -e 'exit RUBY_VERSION >= "1.9"'
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo ">= 1.9" echo ">= 1.9"
"$ruby" --disable-gems -e "$curses_check" "$ruby" --disable-gems -rcurses -e0 2> /dev/null
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
fzf_cmd="$ruby --disable-gems $fzf_base/fzf" fzf_cmd="$ruby --disable-gems $fzf_base/fzf"
else else