From 089cdb63204ba37a66c3e0907d2dbbacd40bb07d Mon Sep 17 00:00:00 2001
From: eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 5 Jan 2003 07:04:10 +0000
Subject: * instruby.rb: need paren in regexp(make -n install).

* ext/extmk.rb (sysquote): do not need to quote on mswin/bccwin/mingw.

* ext/extm.rb ($mflags): uniq items and remove '-' and '--'.
  move options to the lead.

* lib/fileutils.rb (install): model on the real install
  command(message).


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@3292 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 instruby.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'instruby.rb')

diff --git a/instruby.rb b/instruby.rb
index c07a3ff56..c05ef2076 100644
--- a/instruby.rb
+++ b/instruby.rb
@@ -12,10 +12,10 @@ File.umask(0)
 
 getopts("n", "make:", "make-flags:")
 $dryrun = $OPT["n"]
-mflags = Shellwords.shellwords($OPT["make-flags"] || "")
-mflags[0].sub!(/^(?=\w+)$/, "-") unless mflags.empty?
+mflags = Shellwords.shellwords($OPT["make-flags"] || "").uniq
+mflags[0].sub!(/^\w+$/, '-\&') unless mflags.empty?
 make, *mflags[0, 0] = Shellwords.shellwords($OPT['make'] || ENV["MAKE"] || "")
-mflags = mflags.grep(/^-[^-]*/) {$1}.join
+mflags = mflags.grep(/^-([^-])/){$1}.join
 mflags.downcase! if /nmake/i == make
 $dryrun = true if mflags.include?(?n)
 
-- 
cgit