about summary refs log tree commit homepage
path: root/bin
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2009-09-30 23:49:53 -0700
committerEric Wong <normalperson@yhbt.net>2009-09-30 23:49:53 -0700
commit6befcbc2457f6d6eebd836adc08ee34e696588bd (patch)
treec89f815f81038f87de892f31d2be186339377cfe /bin
parente87d9decb82fbbde50926911167fecebd4bcc25e (diff)
downloadunicorn-6befcbc2457f6d6eebd836adc08ee34e696588bd.tar.gz
..but keep -P deprecated.  --path is still useful for testing
ad-hoc changes when you don't want to commit your changes
permanently to a configuration file.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/unicorn_rails12
1 files changed, 8 insertions, 4 deletions
diff --git a/bin/unicorn_rails b/bin/unicorn_rails
index ab9f1c0..5ed054d 100755
--- a/bin/unicorn_rails
+++ b/bin/unicorn_rails
@@ -78,10 +78,14 @@ opts = OptionParser.new("", 24, '  ') do |opts|
     options[:config_file] = File.expand_path(f)
   end
 
-  opts.on("-P", "--path PATH", "DEPRECATED") do |v|
-    warn %q{Use of --path/-P is strongly discouraged}
-    warn %q{Use the RAILS_RELATIVE_URL_ROOT environment variable}
-    warn %q{  or the 'map' directive in the rackup config instead}
+  opts.on("-P PATH", "DEPRECATED") do |v|
+    warn %q{Use of -P is ambiguous and discouraged}
+    warn %q{Use --path or RAILS_RELATIVE_URL_ROOT instead}
+    ENV['RAILS_RELATIVE_URL_ROOT'] = v
+  end
+
+  opts.on("--path PATH", "Runs Rails app mounted at a specific path.",
+          "(default: /)") do |v|
     ENV['RAILS_RELATIVE_URL_ROOT'] = v
   end