diff options
| author | John Szakmeister <john@szakmeister.net> | 2014-11-26 19:53:47 -0500 |
|---|---|---|
| committer | John Szakmeister <john@szakmeister.net> | 2014-11-26 19:53:47 -0500 |
| commit | a6b7b924311eafd80f5983fdbea67842b0e169b4 (patch) | |
| tree | e4bc4ffb6a3071c79274be003490416c510f4afe | |
| parent | 763b62698a4b249debc2c0f9abb9869f7dd669ec (diff) | |
| parent | 78618d742bf36f244880d0e55e784c555e30e60c (diff) | |
| download | rneovim-a6b7b924311eafd80f5983fdbea67842b0e169b4.tar.gz rneovim-a6b7b924311eafd80f5983fdbea67842b0e169b4.tar.bz2 rneovim-a6b7b924311eafd80f5983fdbea67842b0e169b4.zip | |
Merge pull request #1555 from jszakmeister/silent-xclip-find-executable
Avoid printing an error response when detecting xclip.
| -rw-r--r-- | test/functional/shell/viml_system_spec.lua | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/test/functional/shell/viml_system_spec.lua b/test/functional/shell/viml_system_spec.lua index 84c8765b48..8d212c1375 100644 --- a/test/functional/shell/viml_system_spec.lua +++ b/test/functional/shell/viml_system_spec.lua @@ -22,11 +22,9 @@ end -- Some tests require the xclip program and a x server. local xclip = nil -do +do if os.getenv('DISPLAY') then - local proc = io.popen('which xclip') - xclip = proc:read() - proc:close() + xclip = (os.execute('command -v xclip > /dev/null 2>&1') == 0) end end |