wmiirc-rumai

commit 82bf68ce2e9407a047d5c6111175f0d58e6b4bee
parent 527637ab272f68db75d74e9d49f6ce1377d5a905
Author: Simon Hafner <hafnersimon@gmail.com>
Date:   Mon, 11 May 2009 14:44:50 +0200

improved shell handling: escape commands properly

Diffstat:
config.rb
 | 
20
++++++--------------

1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/config.rb b/config.rb
@@ -4,6 +4,10 @@
 # See the LICENSE file for details.
 #++
 
+require 'shellwords'
+require 'pathname'
+require 'yaml'
+
 require 'rubygems'
 gem 'rumai', '~> 3'
 require 'rumai'
@@ -115,7 +119,7 @@ def key_menu choices, prompt = nil
 
   words.push '-p', prompt if prompt
 
-  command = shell_join(words)
+  command = words.shelljoin
   IO.popen(command, 'r+') do |menu|
     menu.puts choices
     menu.close_write
@@ -159,23 +163,13 @@ def click_menu choices, initial = nil
   end
 
   words.concat choices
-  command = shell_join(words)
+  command = words.shelljoin
 
   choice = `#{command}`.chomp
   choice unless choice.empty?
 end
 
 ##
-# Joins the given array of words into a properly quoted shell command.
-#
-def shell_join words
-  # TODO: properly shell escape these items instead of doing String#inspect
-  words.map {|c| c.to_s.inspect }.join(' ')
-end
-
-require 'pathname'
-
-##
 # Returns the basenames of executable files present in the given directories.
 #
 def find_programs *dirs
@@ -232,8 +226,6 @@ class Button < Thread
   alias refresh wakeup
 end
 
-require 'yaml'
-
 ##
 # Loads the given YAML configuration file.
 #