diff options
author | Andre Arko <andre@arko.net> | 2013-09-02 17:36:00 -0700 |
---|---|---|
committer | Andre Arko <andre@arko.net> | 2013-09-02 17:41:56 -0700 |
commit | ef66cdaedb041c7d4845ff5cfeed058e9e0822a8 (patch) | |
tree | 6f2a92babdc3e4300dfb747e6bb472e6bc35ad32 | |
parent | 5048bf94f7b3c5e646eab7fef178adc32e308724 (diff) | |
download | bundler-ef66cdaedb041c7d4845ff5cfeed058e9e0822a8.tar.gz |
make symbol/string consistent for opts
-rw-r--r-- | lib/bundler/cli.rb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb index 09ed7d36c2..a1c54cf4fb 100644 --- a/lib/bundler/cli.rb +++ b/lib/bundler/cli.rb @@ -234,17 +234,16 @@ module Bundler opts["no-cache"] ||= opts[:local] - # Can't use Bundler.settings for this because settings needs gemfile.dirname Bundler.settings[:path] = nil if opts[:system] Bundler.settings[:path] = "vendor/bundle" if opts[:deployment] - Bundler.settings[:path] = opts[:path] if opts[:path] - Bundler.settings[:path] ||= "bundle" if opts[:standalone] + Bundler.settings[:path] = opts["path"] if opts["path"] + Bundler.settings[:path] ||= "bundle" if opts["standalone"] Bundler.settings[:bin] = opts["binstubs"] if opts["binstubs"] Bundler.settings[:bin] = nil if opts["binstubs"] && opts["binstubs"].empty? - Bundler.settings[:shebang] = opts["shebang"] if opts[:shebang] + Bundler.settings[:shebang] = opts["shebang"] if opts["shebang"] Bundler.settings[:jobs] = opts["jobs"] if opts["jobs"] Bundler.settings[:no_prune] = true if opts["no-prune"] - Bundler.settings[:clean] = opts[:clean] if opts[:clean] + Bundler.settings[:clean] = opts["clean"] if opts["clean"] Bundler.settings.without = opts[:without] Bundler.ui.level = "warn" if opts[:quiet] Bundler::Fetcher.disable_endpoint = opts["full-index"] |