Fixed default option and expanded on --help flag

Author: justinhartman

RELEASE_NOTES.md

@@ -0,0 +1,27 @@
+# Release Notes
+This is a dedicated page which documents the changes made to the [Diceware Password Generator][diceware] as well as all the release notes for the software. 
+
+## v1.0.2
+Release Date: 19 March 2018
+
+- Expanded on `-h` option to include `--help` as a flag.
+- Fixed default option so you can just run `$ ./passphrase` without any options and it will return 5 words from the default list.
+- Added license to `download-words`.
+- Printed out more meaningful help when there's an exception when running the script.
+
+## v1.0.1
+Release Date: 18 March 2018
+
+- Minor changes to the output of the command line options.
+- Minor visual update to the License file.
+
+## v1.0.0
+Release Date: 15 March 2018
+
+- First major release since working on the project.
+- Re-factored the original source code to incorporate:
+    + 5 word list dictionaries.
+    + Flags for options as part of the command execution.
+- New license; public domain.
+
+[diceware]: https://justin.hartman.me/projects/diceware-password-generator.html

download-words

@@ -1,4 +1,12 @@
 #!/bin/sh
+#
+# The author disclaims copyright to this source code. In place of
+# a legal notice, here is a blessing:
+#
+#    - May you do good and not evil.
+#    - May you find forgiveness for yourself and forgive others.
+#    - May you share freely, never taking more than you give.
+#
 curl -o words https://www.eff.org/files/2016/07/18/eff_large_wordlist.txt
 curl -o words-vorvig http://norvig.com/ngrams/count_1w.txt
 curl -o words-short-memorable https://www.eff.org/files/2016/09/08/eff_short_wordlist_1.txt

passphrase

@@ -15,15 +15,16 @@ def main(argv):
     short = [s.split()[1] for s in open(sys.path[0]+'/words-short-memorable')]
     edit = [s.split()[1] for s in open(sys.path[0]+'/words-short-edit')]
     beale = [s.split()[1] for s in open(sys.path[0]+'/words-beale')]
-    p = ''
-    n = ''
+    p = words
+    n = range(5)
     try:
-        opts, args = getopt.getopt(argv,"hbwvsen:",["beale","words","vorvig","number","short","edit"])
-    except getopt.GetoptError:
-        print 'Run ./passphrase -h for help.'
+        opts, args = getopt.getopt(argv,"hbwvsen:",["beale","words","vorvig","number","short","edit", "help"])
+    except Exception as e:
+        print e
+        print 'To get help, run $ ./passphrase -h or $ ./passphrase --help'
         sys.exit(2)
     for opt, arg in opts:
-        if opt == '-h':
+        if opt in ('-h', '--help'):
             print '# Version: diceware-password-generator 1.0.1'
             print '# Release Date: 18 March 2018'
             print '# Project: https://justin.hartman.me/projects/diceware-password-generator.html'
@@ -37,7 +38,7 @@ def main(argv):
             print '#'
             print 'Usage: $ ./passphrase [options] [-n] <number of words>'
             print 'Options:'
-            print '-w, --words     Standard word list (default)'
+            print '-w, --words     Standard word list (default list)'
             print '-v, --vorvig    Vorvig word list'
             print '-s, --short     Short, memorable word list'
             print '-e, --edit      Short, editable word list. Experimental.'
@@ -47,7 +48,7 @@ def main(argv):
             print '                you want generated for your passphrase.'
             print ''
             print 'Example: $ ./passphrase --words -n 4'
-            sys.exit()
+            sys.exit(2)
         elif opt in ("-w", "--words"):
             p = words
         elif opt in ("-b", "--beale"):
@@ -60,8 +61,6 @@ def main(argv):
             p = edit
         if opt in ("-n", "--number"):
             n = range(int(arg))
-        elif opt:
-             n = range(5)
     print '-'.join(random.SystemRandom().choice(p) for i in n)
 
 if __name__ == "__main__":