commit 97cd370e7349e6f74471f8ebb6beedb900197551 Author: Arturo Filastò arturo@filasto.net Date: Wed Apr 27 12:14:18 2016 +0200
Always output the same deck filename --- README.rst | 2 +- ooni/deckgen/cli.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/README.rst b/README.rst index f137b88..a6dcb2c 100644 --- a/README.rst +++ b/README.rst @@ -188,7 +188,7 @@ you can do so (be sure to have updated the input resources first) by running::
oonideckgen --country-code IT --output ~/
-You will now have in your home a folder called `deck-YOUR_COUNTRY_CODE`, containing the ooni +You will now have in your home a folder called `deck-it`, containing the ooni deck (ends with .deck) and the inputs. Note: that you should not move the `deck-*` directory once it has been generated as the paths to the inputs referenced by the test in the deck are diff --git a/ooni/deckgen/cli.py b/ooni/deckgen/cli.py index c2ebfd8..2e0e976 100644 --- a/ooni/deckgen/cli.py +++ b/ooni/deckgen/cli.py @@ -111,8 +111,7 @@ def generate_deck(options): if config.advanced.debug: deck.pprint() deck_filename = os.path.join(options['output'], - "%s-%s-user.deck" % (__version__, - options['country-code'])) + "default-user.deck") deck.write_to_file(deck_filename) print "Deck written to %s" % deck_filename print "Run ooniprobe like so:"