summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2009-11-29 20:19:40 -0800
committerEric Wong <normalperson@yhbt.net>2009-11-29 20:20:57 -0800
commit87e760784176b967da2ca8d0db3f54fe6a97598f (patch)
treefb2f0f82387b5bbe1822db558a432fb16556320c
parentb7bc89356dbeb7c16c6c6cb701c0225fd7c643f2 (diff)
Shells already expand '~' before the executables see it, and
relative paths inside symlinks can get set incorrectly to the
actual directory name, and not the (usually desired) symlink
name for things like Capistrano.

Since our paths are now unexpanded, we must now check the
"working_directory" directive and raise an error if the user
specifies the config file in a way that makes the config file
unreloadable.
-rw-r--r--bin/rainbows4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/rainbows b/bin/rainbows
index c5c3d87..ddf968c 100644
--- a/bin/rainbows
+++ b/bin/rainbows
@@ -69,7 +69,7 @@ opts = OptionParser.new("", 24, '  ') do |opts|
   opts.on("-P", "--pid FILE", "DEPRECATED") do |f|
     warn %q{Use of --pid/-P is strongly discouraged}
     warn %q{Use the 'pid' directive in the Unicorn config file instead}
-    options[:pid] = File.expand_path(f)
+    options[:pid] = f
   end
 
   opts.on("-s", "--server SERVER",
@@ -86,7 +86,7 @@ opts = OptionParser.new("", 24, '  ') do |opts|
   end
 
   opts.on("-c", "--config-file FILE", "Unicorn-specific config file") do |f|
-    options[:config_file] = File.expand_path(f)
+    options[:config_file] = f
   end
 
   # I'm avoiding Unicorn-specific config options on the command-line.