From 59c60a46750020879c682433ceb4ed70c750bef6 Mon Sep 17 00:00:00 2001 From: Tim Byrne Date: Fri, 25 Sep 2020 10:03:27 -0500 Subject: [PATCH] Change default archive name to "archive" --- test/conftest.py | 2 +- test/test_unit_configure_paths.py | 2 +- yadm | 12 ++++++------ yadm.1 | 12 ++++++------ 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/test/conftest.py b/test/conftest.py index 7bbc5be..8fe5349 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -285,7 +285,7 @@ def paths(tmpdir, yadm): dir_repo = dir_yadm.mkdir('repo.git') dir_hooks = dir_yadm.mkdir('hooks') dir_remote = dir_root.mkdir('remote') - file_archive = dir_yadm.join('files.gpg') + file_archive = dir_yadm.join('archive') file_bootstrap = dir_yadm.join('bootstrap') file_config = dir_yadm.join('config') file_encrypt = dir_yadm.join('encrypt') diff --git a/test/test_unit_configure_paths.py b/test/test_unit_configure_paths.py index 332277d..5fe291c 100644 --- a/test/test_unit_configure_paths.py +++ b/test/test_unit_configure_paths.py @@ -2,7 +2,7 @@ import pytest -ARCHIVE = 'files.gpg' +ARCHIVE = 'archive' BOOTSTRAP = 'bootstrap' CONFIG = 'config' ENCRYPT = 'encrypt' diff --git a/yadm b/yadm index cfa84cb..59e26d9 100755 --- a/yadm +++ b/yadm @@ -30,7 +30,7 @@ YADM_LEGACY_DIR="${HOME}/.yadm" YADM_REPO="repo.git" YADM_CONFIG="config" YADM_ENCRYPT="encrypt" -YADM_ARCHIVE="files.gpg" +YADM_ARCHIVE="archive" YADM_BOOTSTRAP="bootstrap" YADM_HOOKS="hooks" YADM_ALT="alt" @@ -1168,10 +1168,10 @@ Commands: yadm transcrypt [OPTIONS] - Run transcrypt commands for the yadm repo Files: - \$HOME/.config/yadm/config - yadm's configuration file - \$HOME/.config/yadm/repo.git - yadm's Git repository - \$HOME/.config/yadm/encrypt - List of globs used for encrypt/decrypt - \$HOME/.config/yadm/files.gpg - Encrypted data stored here + \$HOME/.config/yadm/config - yadm's configuration file + \$HOME/.config/yadm/repo.git - yadm's Git repository + \$HOME/.config/yadm/encrypt - List of globs used for encrypt/decrypt + \$HOME/.config/yadm/archive - Encrypted data stored here Use "man yadm" for complete documentation. EOF @@ -1577,7 +1577,7 @@ function issue_legacy_path_warning() { "$YADM_LEGACY_DIR/$YADM_REPO" \ "$YADM_LEGACY_DIR/$YADM_CONFIG" \ "$YADM_LEGACY_DIR/$YADM_ENCRYPT" \ - "$YADM_LEGACY_DIR/$YADM_ARCHIVE" \ + "$YADM_LEGACY_DIR/files.gpg" \ "$YADM_LEGACY_DIR/$YADM_BOOTSTRAP" \ "$YADM_LEGACY_DIR/$YADM_HOOKS"/{pre,post}_* \ ; \ diff --git a/yadm.1 b/yadm.1 index 377cf36..25a2cd8 100644 --- a/yadm.1 +++ b/yadm.1 @@ -174,7 +174,7 @@ See the CONFIGURATION section for more details. .TP .B decrypt Decrypt all files stored in -.IR $HOME/.config/yadm/files.gpg . +.IR $HOME/.config/yadm/archive . Files decrypted will be relative to the configured .IR work-tree " (usually .IR $HOME ). @@ -755,8 +755,8 @@ The .B yadm encrypt command will find all files matching the patterns, and prompt for a password. Once a password has confirmed, the matching files will be encrypted and saved as -.IR $HOME/.config/yadm/files.gpg . -The patterns and files.gpg should be added to the yadm repository so they are +.IR $HOME/.config/yadm/archive . +The "encrypt" and "archive" files should be added to the yadm repository so they are available across multiple systems. To decrypt these files later, or on another system run @@ -804,7 +804,7 @@ dependent upon the user's umask. Because of this, yadm will automatically update the permissions of some file paths. The "group" and "others" permissions will be removed from the following files: -.RI - " $HOME/.config/yadm/files.gpg +.RI - " $HOME/.config/yadm/archive - All files matching patterns in .I $HOME/.config/yadm/encrypt @@ -922,7 +922,7 @@ Git repository used by yadm. .I $YADM_DIR/encrypt List of globs used for encrypt/decrypt .TP -.I $YADM_DIR/files.gpg +.I $YADM_DIR/archive All files encrypted with .B yadm encrypt are stored in this file. @@ -947,7 +947,7 @@ Initial push of master to origin .B echo ".ssh/*.key" >> $HOME/.config/yadm/encrypt Add a new pattern to the list of encrypted files .TP -.B yadm encrypt ; yadm add ~/.config/yadm/files.gpg ; yadm commit +.B yadm encrypt ; yadm add ~/.config/yadm/archive ; yadm commit Commit a new set of encrypted files .SH REPORTING BUGS