From a60ed8b6556dbc03be7c86dd6f41ea356244ab67 Mon Sep 17 00:00:00 2001
From: Tim Byrne <sultan@locehilios.com>
Date: Wed, 23 Mar 2016 02:41:12 -0500
Subject: [PATCH] Add `-Y`/`--yadm-dir` options

An alternate yadm directory may be specified for every command. This
changes where the repository, configurations, and encrypted files are
located.
---
 yadm | 51 +++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 43 insertions(+), 8 deletions(-)

diff --git a/yadm b/yadm
index c698d93..11a1136 100755
--- a/yadm
+++ b/yadm
@@ -20,17 +20,14 @@ VERSION=1.03
 YADM_WORK="$HOME"
 YADM_DIR="$HOME/.yadm"
 
-YADM_REPO="$YADM_DIR/repo.git"
-YADM_CONFIG="$YADM_DIR/config"
-YADM_ENCRYPT="$YADM_DIR/encrypt"
-YADM_ARCHIVE="$YADM_DIR/files.gpg"
+YADM_REPO="repo.git"
+YADM_CONFIG="config"
+YADM_ENCRYPT="encrypt"
+YADM_ARCHIVE="files.gpg"
 
 #; flag when something may have changes (which prompts auto actions to be performed)
 CHANGES_POSSIBLE=0
 
-#; use the yadm repo for all git operations
-export GIT_DIR="$YADM_REPO"
-
 function main() {
 
   require_git
@@ -387,6 +384,42 @@ function version() {
 
 #; ****** Utility Functions ******
 
+function process_global_args() {
+
+  #; global arguments are removed before the main processing is done
+  MAIN_ARGS=()
+  while [[ $# > 0 ]] ; do
+    key="$1"
+    case $key in
+      -Y|--yadm-dir) #; override the standard YADM_DIR
+        if [[ ! "$2" =~ ^/ ]] ; then
+          error_out "You must specify a fully qualified yadm directory"
+        fi
+        YADM_DIR="$2"
+        shift
+      ;;
+      *) #; main arguments are kept intact
+        MAIN_ARGS+=("$1")
+      ;;
+    esac
+    shift
+  done
+
+}
+
+function configure_paths() {
+
+  #; change all paths to be relative to YADM_DIR
+  YADM_REPO="$YADM_DIR/$YADM_REPO"
+  YADM_CONFIG="$YADM_DIR/$YADM_CONFIG"
+  YADM_ENCRYPT="$YADM_DIR/$YADM_ENCRYPT"
+  YADM_ARCHIVE="$YADM_DIR/$YADM_ARCHIVE"
+
+  #; use the yadm repo for all git operations
+  export GIT_DIR="$YADM_REPO"
+
+}
+
 function configure_repo() {
 
   debug "Configuring new repo"
@@ -464,4 +497,6 @@ function require_repo() {
   [ -d "$YADM_REPO" ] || error_out "Git repo does not exist. did you forget to run 'init' or 'clone'?"
 }
 
-main "$@"
+process_global_args "$@"
+configure_paths
+main "${MAIN_ARGS[@]}"