Merge branch 'master' of https://github.com/ushis/clipboard into ushi…

…s-master
keyworks · Apr 21, 2013 · c6de0dd · c6de0dd
2 parents 63cf780 + 79ba30d
commit c6de0dd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/clipboard/file.rb b/lib/clipboard/file.rb
@@ -6,7 +6,7 @@ module Clipboard::File
   FILE = File.expand_path("~/.clipboard")
 
   def copy(text)
-    File.open(FILE,'w'){|f| f.write(text) } rescue ''
+    File.open(FILE, 'w', 0600) { |f| f.write(text) } rescue ''
     paste
   end
 

diff --git a/lib/clipboard/linux.rb b/lib/clipboard/linux.rb
@@ -8,11 +8,11 @@ module Clipboard::Linux
   CLIPBOARDS   = %w[clipboard primary secondary]
 
   # check which backend to use
-  if !`which xclip`.empty?
+  if system('which xclip &>/dev/null')
     WriteCommand = 'xclip'
     ReadCommand  = 'xclip -o'
     Selection    = proc{|x| "-selection #{x}"}
-  elsif !`which xsel`.empty?
+  elsif system('which xsel &>/dev/null')
     WriteCommand = 'xsel'
     ReadCommand  = 'xsel -o'
     Selection    = {'clipboard' => '-b', 'primary' => '-p', 'secondary' => '-s'}