From 672c985e88111dbcd30ff0654256575c33769d13 Mon Sep 17 00:00:00 2001 From: Tim Byrne Date: Thu, 12 Jan 2017 17:15:24 -0600 Subject: [PATCH] Release 1.06 Update version number and update documentation * Improve portability of `hostname` (#23) * Fix incompatibilities between Cygwin and Git for Windows (#26) * Allow Git program to be configured via yadm.git-program (#30) * Support alt-links for encrypted files (#34) * Exit with the same return value as Git (#35) * Support spaces in alt-link paths (#36) * Ignore empty lines in .yadm/encrypt (#40) * Fix typos (#41) --- CHANGES | 10 ++++++++++ CONTRIBUTORS | 7 ++++++- yadm | 2 +- yadm.1 | 2 +- yadm.md | 15 ++++++++++----- yadm.spec | 6 +++--- 6 files changed, 31 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index 845e215..af5fe6d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,13 @@ +1.06 + * Improve portability of `hostname` (#23) + * Fix incompatibilities between Cygwin and Git for Windows (#26) + * Allow Git program to be configured via yadm.git-program (#30) + * Support alt-links for encrypted files (#34) + * Exit with the same return value as Git (#35) + * Support spaces in alt-link paths (#36) + * Ignore empty lines in .yadm/encrypt (#40) + * Fix typos (#41) + 1.05 * Improve portability of shebang line (#14) * Support for symlinked directories (#17) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 70b9a52..af5728f 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2,5 +2,10 @@ CONTRIBUTORS Tim Byrne Espen Henriksen -Franciszek Madej +Paraplegic Racehorse Patrick Hof +Satoshi Ohki +Siôn Le Roux +Tomas Cernaj +Uroš Golja +Franciszek Madej diff --git a/yadm b/yadm index 4e110da..2eb9acc 100755 --- a/yadm +++ b/yadm @@ -19,7 +19,7 @@ if [ -z "$BASH_VERSION" ]; then [ "$YADM_TEST" != 1 ] && exec bash "$0" "$@" fi -VERSION=1.05 +VERSION=1.06 YADM_WORK="$HOME" YADM_DIR="$HOME/.yadm" diff --git a/yadm.1 b/yadm.1 index fc6f040..c1723af 100644 --- a/yadm.1 +++ b/yadm.1 @@ -1,5 +1,5 @@ ." vim: set spell so=8: -.TH yadm 1 "8 September 2016" "1.05" +.TH yadm 1 "13 January 2017" "1.06" .SH NAME yadm \- Yet Another Dotfiles Manager .SH SYNOPSIS diff --git a/yadm.md b/yadm.md index 1409029..719c949 100644 --- a/yadm.md +++ b/yadm.md @@ -192,20 +192,25 @@ Specify an alternate program to use instead of "gpg". By default, the first "gpg" found in $PATH is used. + yadm.git-program + Specify an alternate program to use instead of "git". By + default, the first "git" found in $PATH is used. + ## ALTERNATES When managing a set of files across different systems, it can be useful to have an automated way of choosing an alternate version of a file for a different operating system, host, or user. yadm implements a feature which will automatically create a symbolic link to the appropriate ver- - sion of a file, as long as you follow a specific naming convention. + sion of a file, as long as you follow a specific naming convention. yadm can detect files with names ending in: ## or ##OS or ##OS.HOSTNAME or ##OS.HOSTNAME.USER - If there are any files managed by yadm's repository which match this - naming convention, symbolic links will be created for the most appro- - priate version. This may best be demonstrated by example. Assume the - following files are managed by yadm's repository: + If there are any files managed by yadm's repository, or listed in + $HOME/.yadm/encrypt, which match this naming convention, symbolic links + will be created for the most appropriate version. This may best be + demonstrated by example. Assume the following files are managed by + yadm's repository: - $HOME/path/example.txt## - $HOME/path/example.txt##Darwin diff --git a/yadm.spec b/yadm.spec index ce9794a..a0ea4db 100644 --- a/yadm.spec +++ b/yadm.spec @@ -1,6 +1,6 @@ Summary: Yet Another Dotfiles Manager Name: yadm -Version: 1.05 +Version: 1.06 Release: 1%{?dist} URL: https://github.com/TheLocehiliosan/yadm License: GPLv3 @@ -37,8 +37,8 @@ install -m 644 yadm.1 ${RPM_BUILD_ROOT}%{_mandir}/man1 %doc CHANGES CONTRIBUTORS README.md %changelog -* Thu Jan 12 2017 Tim Byrne - 1.05-1 -- Bump version to 1.05 +* Fri Jan 13 2017 Tim Byrne - 1.06-1 +- Bump version to 1.06 * Tue May 17 2016 Tim Byrne - 1.04-3 - Add missing docs