summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunegunn Choi <junegunn.c@gmail.com>2014-07-27 01:08:30 +0900
committerJunegunn Choi <junegunn.c@gmail.com>2014-07-27 01:08:30 +0900
commita54784cd53f12ea4b8b6bf63a42dd9c86bdb3346 (patch)
tree8ca7d30b22d41cf1cac4da6f6e578fea28d0d457
parent22989b0488fcb384d8e96a7bb610957a2482389b (diff)
Display 'gem install curses' when curses cannot be loaded
-rwxr-xr-xfzf9
-rwxr-xr-xinstall4
2 files changed, 9 insertions, 4 deletions
diff --git a/fzf b/fzf
index 0d5f2cb8..6063585e 100755
--- a/fzf
+++ b/fzf
@@ -7,7 +7,7 @@
# / __/ / /_/ __/
# /_/ /___/_/ Fuzzy finder for your shell
#
-# Version: 0.8.7 (Jul 18, 2014)
+# Version: 0.8.7 (Jul 27, 2014)
#
# Author: Junegunn Choi
# URL: https://github.com/junegunn/fzf
@@ -36,8 +36,13 @@
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+begin
+ require 'curses'
+rescue LoadError
+ $stderr.puts 'curses gem is not installed. Try `gem install curses`.'
+ exit 1
+end
require 'thread'
-require 'curses'
require 'set'
unless String.method_defined? :force_encoding
diff --git a/install b/install
index fd7d49e2..f2d057ad 100755
--- a/install
+++ b/install
@@ -29,9 +29,9 @@ else
echo "Not found"
echo "Installing 'curses' gem ... "
if (( EUID )); then
- /usr/bin/env gem install curses -v 1.0.0 --user-install
+ /usr/bin/env gem install curses --user-install
else
- /usr/bin/env gem install curses -v 1.0.0
+ /usr/bin/env gem install curses
fi
if [ $? -ne 0 ]; then
echo