diff options
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/cmd/diy.rb | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/Library/Homebrew/cmd/diy.rb b/Library/Homebrew/cmd/diy.rb index 174626afc..fa1822c0e 100644 --- a/Library/Homebrew/cmd/diy.rb +++ b/Library/Homebrew/cmd/diy.rb @@ -1,31 +1,35 @@ module Homebrew extend self def diy + %w[name version].each do |opt| + if ARGV.include? "--set-#{opt}" + opoo "--set-#{opt} is deprecated, please use --#{opt}=<#{opt}> instead" + end + end + path = Pathname.getwd - version = if ARGV.include? '--set-version' + version = ARGV.value "version" + version ||= if ARGV.include? "--set-version" ARGV.next elsif path.version.to_s.empty? - raise "Couldn't determine version, try --set-version" + raise "Couldn't determine version, set it with --version=<version>" else path.version end - name = if ARGV.include? '--set-name' + name = ARGV.value "name" + name ||= if ARGV.include? "--set-name" ARGV.next else - path.basename.to_s =~ /(.*?)-?#{version}/ - if $1.to_s.empty? - path.basename - else - $1 - end + basename = path.basename.to_s + basename[/(.*?)-?#{Regexp.escape(version)}/, 1] || basename end prefix = HOMEBREW_CELLAR/name/version - if File.file? 'CMakeLists.txt' + if File.file? "CMakeLists.txt" puts "-DCMAKE_INSTALL_PREFIX=#{prefix}" - elsif File.file? 'Makefile.am' + elsif File.file? "Makefile.am" puts "--prefix=#{prefix}" else raise "Couldn't determine build system" |