From: Olof-Joachim Frahm Date: Wed, 14 Jan 2015 21:58:57 +0000 (+0000) Subject: Add a bit of documentation, environment variables. X-Git-Tag: 0.1.0~2^2~21 X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=e91550537cb692c193d0f7679211aafd9a1686a5;p=crypto-install.git Add a bit of documentation, environment variables. --- diff --git a/README.md b/README.md index 50a36c8..278752f 100644 --- a/README.md +++ b/README.md @@ -14,11 +14,17 @@ it is always safe to do. - `--no-gpg` disables the GnuPG key generation and related setup routines - `--no-ssh` does the same for the OpenSSH setup -- `--gpg-home` sets the directory for the GnuPG files -- `--ssh-home` does the same for OpenSSH files +- `--gpg-home` sets the directory for the GnuPG files (defaults to the + value of `GNUPGHOME` or `~/.gnupg`) +- `--ssh-home` does the same for OpenSSH files (defaults to `~/.ssh`) There is also `-h/--help` and `-v/--version` as expected. +# ENVIRONMENT + +- `FULLNAME`, `EMAIL`, `USER` are used to pre-fill the corresponding + fields + # INSTALLATION Until I set up a better routine: diff --git a/crypto-install.py b/crypto-install.py index 08228a6..c5fe7db 100755 --- a/crypto-install.py +++ b/crypto-install.py @@ -75,7 +75,7 @@ def parse_arguments (): gnupg_group.add_argument ( "--gpg-home", dest = "gnupg_home", - default = "~/.gnupg", + default = os.getenv("GNUPGHOME") or "~/.gnupg", metavar = "PATH", help = "Default directory for GnuPG files.") openssh_group = parser.add_argument_group (