From 3b4c405d7ff0de58622d38b5c2bbe60f890be543 Mon Sep 17 00:00:00 2001 From: Tim Byrne Date: Wed, 18 Jan 2017 19:51:28 -0600 Subject: [PATCH] Allow override of OS/Host/User (#21) --- yadm | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/yadm b/yadm index da7d609..2f96c56 100755 --- a/yadm +++ b/yadm @@ -108,14 +108,26 @@ function alt() { require_repo - #; regex for matching "##SYSTEM.HOSTNAME.USER" - match_system=$(uname -s) + match_system="$(config alt.os)" + if [ -z "$match_system" ] ; then + match_system=$(uname -s) + fi match_system="(%|$match_system)" - match_host=$(hostname) - match_host=${match_host%%.*} #; trim any domain from hostname + + match_host="$(config alt.host)" + if [ -z "$match_host" ] ; then + match_host=$(hostname) + match_host=${match_host%%.*} #; trim any domain from hostname + fi match_host="(%|$match_host)" - match_user=$(id -u -n) + + match_user="$(config alt.user)" + if [ -z "$match_user" ] ; then + match_user=$(id -u -n) + fi match_user="(%|$match_user)" + + #; regex for matching "##SYSTEM.HOSTNAME.USER" match="^(.+)##($match_system|$match_system\.$match_host|$match_system\.$match_host\.$match_user|())$" #; process relative to YADM_WORK