diff options
| author | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-01-05 07:04:10 +0000 |
|---|---|---|
| committer | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-01-05 07:04:10 +0000 |
| commit | 15774ab1fbc7149adb9864817ed336375bfcc005 (patch) | |
| tree | c495c53d1e086a4ffe6e65d46ee6a0df43d519e1 /instruby.rb | |
| parent | a287a10df79e77b288921e9c330cf31d6d23a317 (diff) | |
| download | ruby-15774ab1fbc7149adb9864817ed336375bfcc005.tar.gz | |
* 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@3292 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'instruby.rb')
| -rw-r--r-- | instruby.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/instruby.rb b/instruby.rb index c07a3ff56d..c05ef2076c 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) |