Attempt at fixing how xclip is checked for on Linux systems

2 files changed, 9 insertions, 3 deletions

diff --git a/.travis.yml b/.travis.yml
index 270fe4f7..66fb91ab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,12 @@
 language: python
+
 sudo: false  # false enables container-based build for fast boot times on Linux
+
+addons:
+  apt:
+    packages:
+      - xclip
+
 matrix:
     include:
         - os: linux
diff --git a/cmd2.py b/cmd2.py
index 87140ad4..3e36780b 100755
--- a/cmd2.py
+++ b/cmd2.py
@@ -398,11 +398,10 @@ else:
     # Running on Linux
     try:
         with open(os.devnull, 'w') as DEVNULL:
-            subprocess.check_call('xclip -o -sel clip', shell=True, stdin=subprocess.PIPE, stdout=DEVNULL,
-                                  stderr=DEVNULL)
+            subprocess.check_call(['which', 'xclip'], stdout=DEVNULL, stderr=DEVNULL)
         can_clip = True
     except (subprocess.CalledProcessError, OSError, IOError):
-        pass  # something went wrong with xclip and we cannot use it
+        pass  # xclip is not present, so we cannot use it
     if can_clip:
         def get_paste_buffer():
             """Get the contents of the clipboard for Linux OSes.