Update version number and update documentation

* Support architecture for alternates/templates (#202, #203, #393)
* Support distro_family for alternates/templates (#213)
* Support setting multiple classes (#185, #304)
* Support environment variables in default template processor (#347)
* Update version command to include Bash & Git versions (#377)

CHANGES

@@ -1,3 +1,10 @@
+3.2.0
+  * Support architecture for alternates/templates (#202, #203, #393)
+  * Support distro_family for alternates/templates (#213)
+  * Support setting multiple classes (#185, #304)
+  * Support environment variables in default template processor (#347)
+  * Update version command to include Bash & Git versions (#377)
+
 3.1.1
   * Fix clone support for older versions of Git (#348)
   * Fix support for multiple GPG recipients (#342)

CONTRIBUTORS

@@ -11,11 +11,14 @@ Tin Lai
 Espen Henriksen
 Cameron Eagans
 Klas Mellbourn
+James Clark
 Tomas Cernaj
 jonasc
 Chad Wade Day, Jr
 Sébastien Gross
 David Mandelberg
+Paulo Köch
+Oren Zipori
 Daniel Gray
 Paraplegic Racehorse
 japm48
@@ -23,16 +26,20 @@ Siôn Le Roux
 Mateusz Piotrowski
 Uroš Golja
 Satoshi Ohki
+Nicolas stig124 FORMICHELLA
+Jonas
 Franciszek Madej
 Daniel Wagenknecht
 Stig Palmquist
 Patrick Hof
 con-f-use
+Samisafool
 Bram Ceulemans
 Travis A. Everett
 Sheng Yang
 Jared Smartt
 Adam Jimerson
+dessert1
 addshore
 Tim Condit
 Thomas Luzat

README.md

@@ -72,7 +72,7 @@ The star count helps others discover yadm.
 [master-badge]: https://img.shields.io/github/workflow/status/TheLocehiliosan/yadm/Tests/master?label=master
 [master-commits]: https://github.com/TheLocehiliosan/yadm/commits/master
 [master-date]: https://img.shields.io/github/last-commit/TheLocehiliosan/yadm/master.svg?label=master
-[obs-badge]: https://img.shields.io/badge/OBS-v3.1.1-blue
+[obs-badge]: https://img.shields.io/badge/OBS-v3.2.0-blue
 [obs-link]: https://software.opensuse.org//download.html?project=home%3ATheLocehiliosan%3Ayadm&package=yadm
 [releases-badge]: https://img.shields.io/github/tag/TheLocehiliosan/yadm.svg?label=latest+release
 [releases-link]: https://github.com/TheLocehiliosan/yadm/releases

yadm

@@ -1,6 +1,6 @@
 #!/bin/sh
 # yadm - Yet Another Dotfiles Manager
-# Copyright (C) 2015-2021 Tim Byrne
+# Copyright (C) 2015-2022 Tim Byrne
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@ if [ -z "$BASH_VERSION" ]; then
   [ "$YADM_TEST" != 1 ] && exec bash "$0" "$@"
 fi
 
-VERSION=3.1.1
+VERSION=3.2.0
 
 YADM_WORK="$HOME"
 YADM_DIR=

yadm.1

@@ -1,5 +1,5 @@
 .\" vim: set spell so=8:
-.TH yadm 1 "23 August 2021" "3.1.1"
+.TH yadm 1 "16 March 2022" "3.2.0"
 
 .SH NAME
 

yadm.md

@@ -331,13 +331,20 @@
               Disable the permission changes to $HOME/.ssh/*.  This feature is
               enabled by default.
 
-       The following  four  "local"  configurations  are  not  stored  in  the
+       The following  five  "local"  configurations  are  not  stored  in  the
        $HOME/.config/yadm/config, they are stored in the local repository.
 
 
        local.class
               Specify  a  class for the purpose of symlinking alternate files.
-              By default, no class will be matched.
+              By default, no class will be matched.  The  local  host  can  be
+              assigned multiple classes using command:
+
+              yadm config --add local.class <additional-class>
+
+       local.arch
+              Override  the  architecture for the purpose of symlinking alter-
+              nate files.
 
        local.hostname
               Override the hostname for the purpose  of  symlinking  alternate
@@ -384,13 +391,9 @@
               Valid  if  the  value matches the current user.  Current user is
               calculated by running id -u -n.
 
-       distro, d
+       hostname, h
-              Valid if the value matches the distro.  Distro is calculated  by
+              Valid if the value matches the short hostname.  Hostname is cal-
-              running  lsb_release  -si  or by inspecting the ID from /etc/os-
+              culated by running uname -n, and trimming off any domain.
-              release.
-
-       os, o  Valid if the value matches the OS.  OS is calculated by  running
-              uname -s.
 
        class, c
               Valid if the value matches the local.class configuration.  Class
@@ -398,9 +401,21 @@
               the   CONFIGURATION  section  for  more  details  about  setting
               local.class.
 
-       hostname, h
+       distro, d
-              Valid if the value matches the short hostname.  Hostname is cal-
+              Valid if the value matches the distro.  Distro is calculated  by
-              culated by running uname -n, and trimming off any domain.
+              running  lsb_release  -si  or by inspecting the ID from /etc/os-
+              release.
+
+       distro_family, f
+              Valid if the value matches the distro family.  Distro family  is
+              calculated  by inspecting the ID_LIKE line from /etc/os-release.
+
+       os, o  Valid if the value matches the OS.  OS is calculated by  running
+              uname -s.
+
+       arch, a
+              Valid  if  the  value matches the architecture.  Architecture is
+              calculated by running uname -m.
 
        default
               Valid when no other alternate is valid.
@@ -450,7 +465,7 @@
        $HOME/path/example.txt    ->    $HOME/path/example.txt##os.Darwin,host-
        name.host2
 
-       However, on another Macbook named "host3", yadm will create a symbolic
+       However, on another Mackbook named "host3", yadm will create a symbolic
        link which looks like this:
 
        $HOME/path/example.txt -> $HOME/path/example.txt##os.Darwin
@@ -474,7 +489,7 @@
        then no link will be created.
 
        Links  are also created for directories named this way, as long as they
-       have at least one yadm managed file within them.
+       have at least one yadm managed file within them (at the top level).
 
        yadm will automatically create these links by default. This can be dis-
        abled  using  the yadm.auto-alt configuration.  Even if disabled, links
@@ -488,9 +503,9 @@
 
          yadm config local.class Work
 
-       Similarly,  the  values of os, hostname, and user can be manually over-
+       Similarly, the values of architecture, os, hostname, and  user  can  be
-       ridden using the configuration options  local.os,  local.hostname,  and
+       manually   overridden   using  the  configuration  options  local.arch,
-       local.user.
+       local.os, local.hostname, and local.user.
 
 
 ## TEMPLATES
@@ -533,13 +548,17 @@
        plate:
 
         Default              Jinja or ESH         Description
-        -------------   -------------   --------------------------
+        -------------        -------------        ----------------------------
-        yadm.class      YADM_CLASS      Locally defined yadm class
+        yadm.arch            YADM_ARCH            uname -m
+        yadm.class           YADM_CLASS           Last locally defined class
+        yadm.classes         YADM_CLASSES         All classes
         yadm.distro          YADM_DISTRO          lsb_release -si
+        yadm.distro_family   YADM_DISTRO_FAMILY   ID_LIKE from /etc/os-release
         yadm.hostname        YADM_HOSTNAME        uname -n (without domain)
         yadm.os              YADM_OS              uname -s
-        yadm.user       YADM_USER       id -u -n
         yadm.source          YADM_SOURCE          Template filename
+        yadm.user            YADM_USER            id -u -n
+        env.VAR                                   Environment variable VAR
 
        NOTE: The OS for "Windows Subsystem for Linux" is  reported  as  "WSL",
        even though uname identifies as "Linux".

yadm.spec

@@ -1,7 +1,7 @@
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 Name: yadm
 Summary: Yet Another Dotfiles Manager
-Version: 3.1.1
+Version: 3.2.0
 Group: Development/Tools
 Release: 1%{?dist}
 URL: https://yadm.io