Commit Graph

58 Commits (b1b21c4bef9d51448110d84f4340fff6d20f8175)

Author SHA1 Message Date
Brandon Turner 2ae67d22dc Always use maybe_wait_and_exit in msfupdate
This allows error messages to be seen on windows where exit closes the
console.
2013-11-15 17:26:21 -06:00
Brandon Turner e6c43bfe34 Allow stubbing stdin in msfupdate 2013-11-15 17:15:15 -06:00
Brandon Turner faf8099edf Clean up msfupdate help messages
Don't display options that aren't valid for the platform we are on
2013-11-15 17:07:12 -06:00
Brandon Turner 823aa3a6f7 Validate arguments to msfupdate before updating 2013-11-15 17:01:08 -06:00
Brandon Turner 730edc4bf5 Always exit from maybe_wait_and_exit
Previously calling maybe_wait_and_exit wouldn't actually exit.  This was
the wrong behavior.
2013-11-15 17:00:41 -06:00
Brandon Turner 314e8fd570 Refactor msfupdate so it is testable 2013-11-15 15:24:35 -06:00
Brandon Turner cf74a2c827 Use Getopt to parse options 2013-11-15 11:02:16 -06:00
Brandon Turner 41d51053a0 Add support for offline updates via msfupdate
If using a binary installer, you may install an offline update with:
  msfupdate offline-update.bin
2013-10-31 16:56:10 -05:00
g0tmi1k 1882c3f483 Removed un-needed comment 2013-10-10 19:28:40 +00:00
g0tmi1k fedf2322b6 Fixed grammer 2013-10-10 18:59:03 +00:00
g0tmi1k 6b004086ea Removed SVN from msfupdate 2013-10-10 12:25:00 +00:00
Tab Assassin 2e8d19edcf Retab all the things (except external/) 2013-09-30 13:47:53 -05:00
Brandon Turner 1d83c7e211 Automatically update gems after running msfupdate 2013-04-05 09:42:15 -05:00
Brandon Turner 100da887ae Ensure language is english when parsing apt output
[FIXRM #7852]
[Fixes #47088769]
2013-03-28 14:01:36 -05:00
Tod Beardsley debae8a944 Always exit with status 11 when SVN 2013-03-26 14:32:21 -05:00
Tod Beardsley c322b91a83 Fully deprecates msfupdate over SVN
Once this lands, SVN users will no longer be able to update over SVN.
2013-03-14 15:21:33 -05:00
Brandon Turner 709ec8a519 Use start.sh to start Pro via msfupdate command
start.sh (installed with community/pro on apt installs) automatically
starts dependency services (such as postgresql).
2013-03-05 15:27:13 -06:00
James Lee e4e9a94329 Merge remote-tracking branch 'todb-r7/msfconsole-svn-warn' into rapid7 2013-02-21 15:31:35 -06:00
Brandon Turner 73f136ef9a Update msfupdate to work with debian packages
If apt was used to install framework, use apt-get to update.
2013-02-09 23:12:12 -06:00
Tod Beardsley 17dad0e67b Update the deprecation note, add to msfconsole
This will cause msfconsole to throw a warning as well as msfupdate.

The deadline for action is also set at the end of February.
2013-01-24 11:02:47 -06:00
Tod Beardsley 279a61d0f4 Add the optional pause for Windows 2013-01-15 13:44:59 -06:00
Tod Beardsley db4a392de2 Msfupdate should check for installation validity
This fix will allow people to at least solve their own msfupdate
problems by registering for Community Edition.

[SeeRM #7690]
2013-01-15 13:44:59 -06:00
Tod Beardsley 4bc1159953 Fixes a pro bug with updating
This came up in a release candidate for Metasploit 4.5, haven't
exercised this code path yet.

Aint no thang.

[FixRM #7549]
2012-11-30 16:51:03 -06:00
Tod Beardsley 7f72eae8b9 Comment the one case where we backtick git
There is only the one time we actually need the output of the local git
command, so comment it accordingly.

Someday, in the unknowable future, we'll use a proper Git library
instead of backticks and system() calls.
2012-11-30 15:41:05 -06:00
Erran Carey 8c9e1abc8d Fix typos 2012-11-30 15:25:12 -06:00
Erran Carey 2b5c1c8e6f Update msfupdate to accommodate for forks and clones. 2012-11-30 15:25:12 -06:00
HD Moore e1f35c501d Update using the MSP updater if available 2012-11-21 09:38:05 -06:00
Tod Beardsley da9963d3d9 Be verbose about stashes 2012-11-05 14:52:14 -06:00
Tod Beardsley 8ebaee4b7c Don't just trash local changes 2012-11-05 14:37:32 -06:00
Tod Beardsley d3cb9c141d No longer TODO on the deprecation duh 2012-11-05 12:32:36 -06:00
Tod Beardsley c8fd6ded0c Slightly better margins for deprecation 2012-11-05 12:15:11 -06:00
Tod Beardsley 628f676b21 Fill in the deprecation warning 2012-11-05 12:13:10 -06:00
Tod Beardsley 0d7de4b575 Allow for naming a git remote/branch 2012-11-05 11:56:05 -06:00
Tod Beardsley df53409b2d Make msfbase_dir an instance variable 2012-11-05 11:48:09 -06:00
Tod Beardsley 0f40fabfcd Oops on is_svn 2012-11-05 11:46:50 -06:00
Tod Beardsley b7eca59934 Allow for switching between git and svn
Depending on the kind of checkout, msfupdate should be smart about this.
This was first proposed by @corelanc0d3r I believe, but rejected because
it didn't seem to solve any immediate problem. Now, it does, as we are
ditching SVN Real Soon Now for performance reasons.

This change is minimal functionality and doesn't handle switching over
from one to the other.
2012-11-05 11:44:53 -06:00
Tod Beardsley 09f34268d2 Deal with blank or missing config-dir better
Just deleting at an index will be surprising when you've already deleted
the wait/nowait. Use an Array#compact strategy instead.

Also, always define a sensible config-dir, even if none is given. If the
user wants to pass one especially, they can.

[FixRM #7297]
2012-10-10 10:18:40 -05:00
Tod Beardsley f247379bb1 Handle the old wait/nowait shift behavior.
The old msfupdate would shift the first argument off the stack
regardless what it was. We have two possible candaidates now, wait and
nowait. Shouldn't be any others.

[SeeRM #7297]
2012-10-10 09:50:30 -05:00
James Lee 9a0a063048 Whitespace at EOL 2012-10-09 16:56:22 -05:00
Tod Beardsley a31984c0ab Always provide --config-dir for msfupdate
Otherwise, you will run into problems described in #882.
2012-10-09 16:25:06 -05:00
Tod Beardsley 7dbe512fed Question Answered 2012-10-03 17:06:38 -05:00
Tod Beardsley 31c50ccccb commenting the weird while vs if choice 2012-10-01 13:15:10 -05:00
Tod Beardsley c7ecdfb98e Instance variables for semaphores and scope 2012-10-01 13:11:01 -05:00
Tod Beardsley 2573814c9d Deal with these arguments sensibly 2012-10-01 13:07:51 -05:00
Tod Beardsley ee4c6bb976 Deal with wait more sensibly 2012-10-01 12:41:36 -05:00
Tod Beardsley 2b44cd0322 Lets not modify the constant ARGV at runtime 2012-10-01 12:30:37 -05:00
HD Moore 768b66dd7e Add the --non-interactive flag to msfupdate (thx pyllyukko) 2012-09-04 14:06:04 -05:00
HD Moore d656e3185f Mark all libraries as defaulting to 8-bit strings 2012-06-29 00:18:28 -05:00
Joshua Drake 5905ef3fad msftidy pass on msf*
git-svn-id: file:///home/svn/framework3/trunk@14035 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-23 12:04:41 +00:00
David Rude 7cd144e7d6 fix the logic so root can run msfupdate even if the install is owned by a user
git-svn-id: file:///home/svn/framework3/trunk@13862 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-10 21:20:56 +00:00