| 
									
										
										
										
											2016-06-18 15:33:49 +00:00
										 |  |  | #!/bin/sh | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | # yadm - Yet Another Dotfiles Manager | 
					
						
							|  |  |  | # Copyright (C) 2015  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 | 
					
						
							|  |  |  | # the Free Software Foundation, version 3 of the License. | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | # This program is distributed in the hope that it will be useful, | 
					
						
							|  |  |  | # but WITHOUT ANY WARRANTY; without even the implied warranty of | 
					
						
							|  |  |  | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | 
					
						
							|  |  |  | # GNU General Public License for more details. | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | # You should have received a copy of the GNU General Public License | 
					
						
							|  |  |  | # along with this program.  If not, see <http://www.gnu.org/licenses/>. | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-06-18 15:33:49 +00:00
										 |  |  | #; execute script with bash (shebang line is /bin/sh for portability) | 
					
						
							|  |  |  | if [ -z "$BASH_VERSION" ]; then | 
					
						
							|  |  |  |   [ "$YADM_TEST" != 1 ] && exec bash "$0" "$@" | 
					
						
							|  |  |  | fi | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-01-12 23:15:24 +00:00
										 |  |  | VERSION=1.06 | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | YADM_WORK="$HOME" | 
					
						
							|  |  |  | YADM_DIR="$HOME/.yadm" | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-03-23 07:41:12 +00:00
										 |  |  | YADM_REPO="repo.git" | 
					
						
							|  |  |  | YADM_CONFIG="config" | 
					
						
							|  |  |  | YADM_ENCRYPT="encrypt" | 
					
						
							|  |  |  | YADM_ARCHIVE="files.gpg" | 
					
						
							| 
									
										
										
										
											2017-01-23 23:23:06 +00:00
										 |  |  | YADM_BOOTSTRAP="bootstrap" | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-08-13 22:17:16 +00:00
										 |  |  | GPG_PROGRAM="gpg" | 
					
						
							| 
									
										
										
										
											2017-01-08 01:44:43 +00:00
										 |  |  | GIT_PROGRAM="git" | 
					
						
							| 
									
										
										
										
											2016-08-25 12:19:43 +00:00
										 |  |  | LS_PROGRAM="/bin/ls" | 
					
						
							| 
									
										
										
										
											2016-08-13 22:17:16 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-01-09 01:04:40 +00:00
										 |  |  | #; flag causing path translations with cygpath | 
					
						
							|  |  |  | USE_CYGPATH=0 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | #; flag when something may have changes (which prompts auto actions to be performed) | 
					
						
							|  |  |  | CHANGES_POSSIBLE=0 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-01-25 07:07:07 +00:00
										 |  |  | #; flag when a bootstrap should be performed after cloning | 
					
						
							|  |  |  | #; 0: skip auto_bootstrap, 1: ask, 2: perform bootstrap, 3: prevent bootstrap | 
					
						
							|  |  |  | DO_BOOTSTRAP=0 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | function main() { | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   require_git | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   #; create the YADM_DIR if it doesn't exist yet | 
					
						
							| 
									
										
										
										
											2016-04-05 13:52:21 +00:00
										 |  |  |   [ -d "$YADM_DIR" ] || mkdir -p "$YADM_DIR" | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |   #; parse command line arguments | 
					
						
							| 
									
										
										
										
											2017-01-06 22:27:24 +00:00
										 |  |  |   local retval=0 | 
					
						
							| 
									
										
										
										
											2017-01-23 23:23:06 +00:00
										 |  |  |   internal_commands="^(alt|bootstrap|clean|clone|config|decrypt|encrypt|help|init|list|perms|version)$" | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |   if [ -z "$*" ] ; then | 
					
						
							|  |  |  |     #; no argumnts will result in help() | 
					
						
							|  |  |  |     help | 
					
						
							|  |  |  |   elif [[ "$1" =~ $internal_commands ]] ; then | 
					
						
							|  |  |  |     #; for internal commands, process all of the arguments | 
					
						
							|  |  |  |     YADM_COMMAND="$1" | 
					
						
							| 
									
										
										
										
											2016-04-05 13:52:21 +00:00
										 |  |  |     YADM_ARGS=() | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |     shift | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-04-05 13:52:21 +00:00
										 |  |  |     while [[ $# -gt 0 ]] ; do | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |       key="$1" | 
					
						
							|  |  |  |       case $key in | 
					
						
							| 
									
										
										
										
											2015-07-14 21:39:52 +00:00
										 |  |  |         -a) #; used by list() | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |           LIST_ALL="YES" | 
					
						
							|  |  |  |         ;; | 
					
						
							| 
									
										
										
										
											2015-07-14 21:39:52 +00:00
										 |  |  |         -d) #; used by all commands | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |           DEBUG="YES" | 
					
						
							|  |  |  |         ;; | 
					
						
							| 
									
										
										
										
											2015-07-14 21:39:52 +00:00
										 |  |  |         -f) #; used by init() and clone() | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |           FORCE="YES" | 
					
						
							|  |  |  |         ;; | 
					
						
							| 
									
										
										
										
											2015-07-17 01:57:53 +00:00
										 |  |  |         -l) #; used by decrypt() | 
					
						
							|  |  |  |           DO_LIST="YES" | 
					
						
							|  |  |  |         ;; | 
					
						
							| 
									
										
										
										
											2015-07-14 21:39:52 +00:00
										 |  |  |         -w) #; used by init() and clone() | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |           if [[ ! "$2" =~ ^/ ]] ; then | 
					
						
							|  |  |  |             error_out "You must specify a fully qualified work tree" | 
					
						
							|  |  |  |           fi | 
					
						
							|  |  |  |           YADM_WORK="$2" | 
					
						
							|  |  |  |           shift | 
					
						
							|  |  |  |         ;; | 
					
						
							|  |  |  |         *) #; any unhandled arguments | 
					
						
							| 
									
										
										
										
											2016-04-05 13:52:21 +00:00
										 |  |  |           YADM_ARGS+=("$1") | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |         ;; | 
					
						
							|  |  |  |       esac | 
					
						
							|  |  |  |       shift | 
					
						
							|  |  |  |     done | 
					
						
							| 
									
										
										
										
											2016-04-05 13:52:21 +00:00
										 |  |  |     [ ! -d "$YADM_WORK" ] && error_out "Work tree does not exist: [$YADM_WORK]" | 
					
						
							|  |  |  |     $YADM_COMMAND "${YADM_ARGS[@]}" | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |   else | 
					
						
							|  |  |  |     #; any other commands are simply passed through to git | 
					
						
							|  |  |  |     git_command "$@" | 
					
						
							| 
									
										
										
										
											2017-01-06 22:27:24 +00:00
										 |  |  |     retval="$?" | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |   fi | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   #; process automatic events | 
					
						
							|  |  |  |   auto_alt | 
					
						
							|  |  |  |   auto_perms | 
					
						
							| 
									
										
										
										
											2017-01-25 07:07:07 +00:00
										 |  |  |   auto_bootstrap | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-01-06 22:27:24 +00:00
										 |  |  |   exit $retval | 
					
						
							| 
									
										
										
										
											2016-03-24 00:13:04 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-07-14 21:39:52 +00:00
										 |  |  | #; ****** yadm Commands ****** | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | function alt() { | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   require_repo | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-01-26 14:29:51 +00:00
										 |  |  |   match_class="$(config local.class)" | 
					
						
							| 
									
										
										
										
											2017-01-20 06:14:10 +00:00
										 |  |  |   if [ -z "$match_class" ] ; then | 
					
						
							|  |  |  |     match_class="()" | 
					
						
							|  |  |  |   fi | 
					
						
							|  |  |  |   match_class="(%|$match_class)" | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-01-26 14:29:51 +00:00
										 |  |  |   match_system="$(config local.os)" | 
					
						
							| 
									
										
										
										
											2017-01-19 01:51:28 +00:00
										 |  |  |   if [ -z "$match_system" ] ; then | 
					
						
							|  |  |  |     match_system=$(uname -s) | 
					
						
							|  |  |  |   fi | 
					
						
							| 
									
										
										
										
											2017-01-18 07:13:27 +00:00
										 |  |  |   match_system="(%|$match_system)" | 
					
						
							| 
									
										
										
										
											2017-01-19 01:51:28 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-01-26 14:29:51 +00:00
										 |  |  |   match_host="$(config local.host)" | 
					
						
							| 
									
										
										
										
											2017-01-19 01:51:28 +00:00
										 |  |  |   if [ -z "$match_host" ] ; then | 
					
						
							|  |  |  |     match_host=$(hostname) | 
					
						
							|  |  |  |     match_host=${match_host%%.*} #; trim any domain from hostname | 
					
						
							|  |  |  |   fi | 
					
						
							| 
									
										
										
										
											2017-01-18 07:13:27 +00:00
										 |  |  |   match_host="(%|$match_host)" | 
					
						
							| 
									
										
										
										
											2017-01-19 01:51:28 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-01-26 14:29:51 +00:00
										 |  |  |   match_user="$(config local.user)" | 
					
						
							| 
									
										
										
										
											2017-01-19 01:51:28 +00:00
										 |  |  |   if [ -z "$match_user" ] ; then | 
					
						
							|  |  |  |     match_user=$(id -u -n) | 
					
						
							|  |  |  |   fi | 
					
						
							| 
									
										
										
										
											2017-01-18 07:13:27 +00:00
										 |  |  |   match_user="(%|$match_user)" | 
					
						
							| 
									
										
										
										
											2017-01-19 01:51:28 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-01-20 06:14:10 +00:00
										 |  |  |   #; regex for matching "<file>##CLASS.SYSTEM.HOSTNAME.USER" | 
					
						
							|  |  |  |   match="^(.+)##(()|$match_class|$match_system|$match_class\.$match_system|$match_system\.$match_host|$match_class\.$match_system\.$match_host|$match_system\.$match_host\.$match_user|$match_class\.$match_system\.$match_host\.$match_user)$" | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |   #; process relative to YADM_WORK | 
					
						
							| 
									
										
										
										
											2017-01-09 01:04:40 +00:00
										 |  |  |   YADM_WORK=$(unix_path "$("$GIT_PROGRAM" config core.worktree)") | 
					
						
							| 
									
										
										
										
											2016-04-05 13:52:21 +00:00
										 |  |  |   cd "$YADM_WORK" || { | 
					
						
							|  |  |  |     debug "Alternates not processed, unable to cd to $YADM_WORK" | 
					
						
							|  |  |  |     return | 
					
						
							|  |  |  |   } | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |   #; only be noisy if the "alt" command was run directly | 
					
						
							| 
									
										
										
										
											2015-07-17 21:21:47 +00:00
										 |  |  |   [ "$YADM_COMMAND" = "alt" ] && loud="YES" | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |   #; loop over all "tracked" files | 
					
						
							|  |  |  |   #; for every file which matches the above regex, create a symlink | 
					
						
							| 
									
										
										
										
											2016-08-05 21:09:26 +00:00
										 |  |  |   last_linked='' | 
					
						
							| 
									
										
										
										
											2017-01-06 13:55:42 +00:00
										 |  |  |   local IFS=$'\n' | 
					
						
							| 
									
										
										
										
											2017-01-08 01:44:43 +00:00
										 |  |  |   for tracked_file in $("$GIT_PROGRAM" ls-files | sort) $(cat "$YADM_ENCRYPT" 2>/dev/null); do | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |     tracked_file="$YADM_WORK/$tracked_file" | 
					
						
							| 
									
										
										
										
											2016-08-05 21:09:26 +00:00
										 |  |  |     #; process both the path, and it's parent directory | 
					
						
							|  |  |  |     for alt_path in "$tracked_file" "${tracked_file%/*}"; do | 
					
						
							|  |  |  |       if [ -e "$alt_path" ] ; then | 
					
						
							|  |  |  |         if [[ $alt_path =~ $match ]] ; then | 
					
						
							|  |  |  |           if [ "$alt_path" != "$last_linked" ] ; then | 
					
						
							|  |  |  |             new_link="${BASH_REMATCH[1]}" | 
					
						
							|  |  |  |             debug "Linking $alt_path to $new_link" | 
					
						
							|  |  |  |             [ -n "$loud" ] && echo "Linking $alt_path to $new_link" | 
					
						
							|  |  |  |             ln -nfs "$alt_path" "$new_link" | 
					
						
							|  |  |  |             last_linked="$alt_path" | 
					
						
							|  |  |  |           fi | 
					
						
							|  |  |  |         fi | 
					
						
							| 
									
										
										
										
											2015-07-14 15:04:09 +00:00
										 |  |  |       fi | 
					
						
							| 
									
										
										
										
											2016-08-05 21:09:26 +00:00
										 |  |  |     done | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |   done | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-01-23 23:23:06 +00:00
										 |  |  | function bootstrap() { | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   bootstrap_available || error_out "Cannot execute bootstrap\n'$YADM_BOOTSTRAP' is not an executable program." | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-01-31 03:20:37 +00:00
										 |  |  |   # GIT_DIR should not be set for user's bootstrap code | 
					
						
							|  |  |  |   unset GIT_DIR | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-01-23 23:23:06 +00:00
										 |  |  |   echo "Executing $YADM_BOOTSTRAP" | 
					
						
							|  |  |  |   exec "$YADM_BOOTSTRAP" | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | function clean() { | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   error_out "\"git clean\" has been disabled for safety. You could end up removing all unmanaged files." | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | function clone() { | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-01-25 07:07:07 +00:00
										 |  |  |   DO_BOOTSTRAP=1 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   clone_args=() | 
					
						
							|  |  |  |   while [[ $# -gt 0 ]] ; do | 
					
						
							|  |  |  |     key="$1" | 
					
						
							|  |  |  |     case $key in | 
					
						
							|  |  |  |       --bootstrap) #; force bootstrap, without prompt | 
					
						
							|  |  |  |         DO_BOOTSTRAP=2 | 
					
						
							|  |  |  |       ;; | 
					
						
							|  |  |  |       --no-bootstrap) #; prevent bootstrap, without prompt | 
					
						
							|  |  |  |         DO_BOOTSTRAP=3 | 
					
						
							|  |  |  |       ;; | 
					
						
							|  |  |  |       *) #; main arguments are kept intact | 
					
						
							|  |  |  |         clone_args+=("$1") | 
					
						
							|  |  |  |       ;; | 
					
						
							|  |  |  |     esac | 
					
						
							|  |  |  |     shift | 
					
						
							|  |  |  |   done | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |   #; clone will begin with a bare repo | 
					
						
							| 
									
										
										
										
											2017-01-08 01:44:43 +00:00
										 |  |  |   local empty= | 
					
						
							|  |  |  |   init $empty | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |   #; add the specified remote, and configure the repo to track origin/master | 
					
						
							|  |  |  |   debug "Adding remote to new repo" | 
					
						
							| 
									
										
										
										
											2017-01-25 07:07:07 +00:00
										 |  |  |   "$GIT_PROGRAM" remote add origin "${clone_args[@]}" | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |   debug "Configuring new repo to track origin/master" | 
					
						
							| 
									
										
										
										
											2017-01-08 01:44:43 +00:00
										 |  |  |   "$GIT_PROGRAM" config branch.master.remote origin | 
					
						
							|  |  |  |   "$GIT_PROGRAM" config branch.master.merge refs/heads/master | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |   #; fetch / merge (and possibly fallback to reset) | 
					
						
							|  |  |  |   debug "Doing an initial fetch of the origin" | 
					
						
							| 
									
										
										
										
											2017-01-08 01:44:43 +00:00
										 |  |  |   "$GIT_PROGRAM" fetch origin || { | 
					
						
							| 
									
										
										
										
											2016-03-30 08:31:21 +00:00
										 |  |  |     debug "Removing repo after failed clone" | 
					
						
							|  |  |  |     rm -rf "$YADM_REPO" | 
					
						
							| 
									
										
										
										
											2017-01-25 07:07:07 +00:00
										 |  |  |     error_out "Unable to fetch origin ${clone_args[0]}" | 
					
						
							| 
									
										
										
										
											2016-03-30 08:31:21 +00:00
										 |  |  |   } | 
					
						
							| 
									
										
										
										
											2015-07-14 13:16:45 +00:00
										 |  |  |   debug "Doing an initial merge of origin/master" | 
					
						
							| 
									
										
										
										
											2017-01-08 01:44:43 +00:00
										 |  |  |   "$GIT_PROGRAM" merge origin/master || { | 
					
						
							| 
									
										
										
										
											2017-01-20 23:11:23 +00:00
										 |  |  |     debug "Merge failed, doing a reset and stashing conflicts." | 
					
						
							| 
									
										
										
										
											2017-01-08 01:44:43 +00:00
										 |  |  |     "$GIT_PROGRAM" reset origin/master | 
					
						
							| 
									
										
										
										
											2017-01-20 23:11:23 +00:00
										 |  |  |     if cd "$YADM_WORK"; then # necessary because of a bug in Git | 
					
						
							|  |  |  |       "$GIT_PROGRAM" -c user.name='yadm clone' -c user.email='yadm' stash save Conflicts preserved from yadm clone command 2>&1 | 
					
						
							|  |  |  |       cat <<EOF | 
					
						
							|  |  |  | **NOTE** | 
					
						
							|  |  |  |   Merging origin/master failed. | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   As a result, yadm did 'reset origin/master', and then | 
					
						
							|  |  |  |   stashed the conflicting data. | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   This likely happened because you had files in \$HOME | 
					
						
							|  |  |  |   which conflicted with files tracked by origin/master. | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-01-27 14:22:31 +00:00
										 |  |  |   You can review the stashed conflicts with the | 
					
						
							|  |  |  |   command 'yadm stash show -p' from within your | 
					
						
							|  |  |  |   \$HOME directory. If you want to restore the | 
					
						
							|  |  |  |   stashed data, you can run 'yadm stash apply' or | 
					
						
							|  |  |  |   'yadm stash pop' and then handle the conflicts | 
					
						
							|  |  |  |   in another way. | 
					
						
							| 
									
										
										
										
											2017-01-20 23:11:23 +00:00
										 |  |  | EOF | 
					
						
							|  |  |  |     else | 
					
						
							| 
									
										
										
										
											2017-01-25 07:07:07 +00:00
										 |  |  |       #; skip auto_bootstrap if conflicts could not be stashed | 
					
						
							|  |  |  |       DO_BOOTSTRAP=0 | 
					
						
							| 
									
										
										
										
											2017-01-20 23:11:23 +00:00
										 |  |  |       cat <<EOF | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | **NOTE** | 
					
						
							|  |  |  |   Merging origin/master failed. | 
					
						
							| 
									
										
										
										
											2015-07-14 21:39:52 +00:00
										 |  |  |   yadm did 'reset origin/master' instead. | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-01-20 23:11:23 +00:00
										 |  |  |   yadm did not stash these conflicts beacuse it was unable | 
					
						
							|  |  |  |   to change to the $YADM_WORK directory. | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |   Please review and resolve any differences appropriately | 
					
						
							|  |  |  |   If you know what you're doing, and want to overwrite the | 
					
						
							|  |  |  |   tracked files, consider 'yadm reset --hard origin/master' | 
					
						
							|  |  |  | EOF | 
					
						
							| 
									
										
										
										
											2017-01-20 23:11:23 +00:00
										 |  |  |     fi | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |   } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   CHANGES_POSSIBLE=1 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | function config() { | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-01-26 14:29:51 +00:00
										 |  |  |   use_repo_config=0 | 
					
						
							|  |  |  |   local_options="^local\.(class|os|host|user)$" | 
					
						
							|  |  |  |   for option in "$@"; do | 
					
						
							|  |  |  |     [[ "$option" =~ $local_options ]] && use_repo_config=1 | 
					
						
							|  |  |  |   done | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-07-14 21:39:52 +00:00
										 |  |  |   if [ -z "$*" ] ; then | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |     #; with no parameters, provide some helpful documentation | 
					
						
							| 
									
										
										
										
											2017-01-25 23:28:55 +00:00
										 |  |  |     cat << EOF | 
					
						
							|  |  |  | yadm supports the following configurations: | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-01-26 14:29:51 +00:00
										 |  |  |   local.class | 
					
						
							|  |  |  |   local.host | 
					
						
							|  |  |  |   local.os | 
					
						
							|  |  |  |   local.user | 
					
						
							| 
									
										
										
										
											2017-01-25 23:28:55 +00:00
										 |  |  |   yadm.auto-alt | 
					
						
							|  |  |  |   yadm.auto-perms | 
					
						
							|  |  |  |   yadm.git-program | 
					
						
							|  |  |  |   yadm.gpg-perms | 
					
						
							|  |  |  |   yadm.gpg-program | 
					
						
							|  |  |  |   yadm.gpg-recipient | 
					
						
							|  |  |  |   yadm.ssh-perms | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | Please read the CONFIGURATION section in the man | 
					
						
							|  |  |  | page for more details about configurations, and | 
					
						
							|  |  |  | how to adjust them. | 
					
						
							|  |  |  | EOF | 
					
						
							| 
									
										
										
										
											2017-01-26 14:29:51 +00:00
										 |  |  |   elif [ "$use_repo_config" -eq 1 ]; then | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     require_repo | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     #; operate on the yadm repo's configuration file | 
					
						
							|  |  |  |     #; this is always local to the machine | 
					
						
							|  |  |  |     git config --local "$@" | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     CHANGES_POSSIBLE=1 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |   else | 
					
						
							| 
									
										
										
										
											2015-07-14 21:39:52 +00:00
										 |  |  |     #; operate on the yadm configuration file | 
					
						
							| 
									
										
										
										
											2017-01-09 01:04:40 +00:00
										 |  |  |     git config --file="$(mixed_path "$YADM_CONFIG")" "$@" | 
					
						
							| 
									
										
										
										
											2017-01-21 17:41:14 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |   fi | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | function decrypt() { | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   require_gpg | 
					
						
							|  |  |  |   require_archive | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-01-09 01:04:40 +00:00
										 |  |  |   YADM_WORK=$(unix_path "$("$GIT_PROGRAM" config core.worktree)") | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-07-17 21:21:47 +00:00
										 |  |  |   if [ "$DO_LIST" = "YES" ] ; then | 
					
						
							| 
									
										
										
										
											2015-07-17 01:57:53 +00:00
										 |  |  |     tar_option="t" | 
					
						
							|  |  |  |   else | 
					
						
							|  |  |  |     tar_option="x" | 
					
						
							|  |  |  |   fi | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |   #; decrypt the archive | 
					
						
							| 
									
										
										
										
											2017-01-06 23:05:06 +00:00
										 |  |  |   if ($GPG_PROGRAM -d "$YADM_ARCHIVE" || echo 1) | tar v${tar_option}f - -C "$YADM_WORK"; then | 
					
						
							| 
									
										
										
										
											2015-07-17 21:21:47 +00:00
										 |  |  |     [ ! "$DO_LIST" = "YES" ] && echo "All files decrypted." | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |   else | 
					
						
							|  |  |  |     error_out "Unable to extract encrypted files." | 
					
						
							|  |  |  |   fi | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   CHANGES_POSSIBLE=1 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | function encrypt() { | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   require_gpg | 
					
						
							|  |  |  |   require_encrypt | 
					
						
							| 
									
										
										
										
											2016-08-25 12:19:43 +00:00
										 |  |  |   require_ls | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |   #; process relative to YADM_WORK | 
					
						
							| 
									
										
										
										
											2017-01-09 01:04:40 +00:00
										 |  |  |   YADM_WORK=$(unix_path "$("$GIT_PROGRAM" config core.worktree)") | 
					
						
							| 
									
										
										
										
											2016-04-05 13:52:21 +00:00
										 |  |  |   cd "$YADM_WORK" || { | 
					
						
							|  |  |  |     debug "Encryption not processed, unable to cd to $YADM_WORK" | 
					
						
							|  |  |  |     return | 
					
						
							|  |  |  |   } | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-04-19 19:06:35 +00:00
										 |  |  |   #; Build gpg options for gpg | 
					
						
							| 
									
										
										
										
											2016-04-21 12:33:49 +00:00
										 |  |  |   GPG_KEY="$(config yadm.gpg-recipient)" | 
					
						
							| 
									
										
										
										
											2016-04-21 12:59:43 +00:00
										 |  |  |   if [ "$GPG_KEY" = "ASK" ]; then | 
					
						
							|  |  |  |     GPG_OPTS=("--no-default-recipient" "-e") | 
					
						
							|  |  |  |   elif [ "$GPG_KEY" != "" ]; then | 
					
						
							|  |  |  |     GPG_OPTS=("-e" "-r $GPG_KEY") | 
					
						
							| 
									
										
										
										
											2016-04-19 19:06:35 +00:00
										 |  |  |   else | 
					
						
							| 
									
										
										
										
											2016-04-21 12:59:43 +00:00
										 |  |  |     GPG_OPTS=("-c") | 
					
						
							| 
									
										
										
										
											2016-04-19 19:06:35 +00:00
										 |  |  |   fi | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |   #; build a list of globs from YADM_ENCRYPT | 
					
						
							|  |  |  |   GLOBS=() | 
					
						
							|  |  |  |   while IFS='' read -r glob || [ -n "$glob" ]; do | 
					
						
							| 
									
										
										
										
											2017-01-08 17:11:01 +00:00
										 |  |  |     if [[ ! $glob =~ ^# && ! $glob =~ ^[[:space:]]*$ ]] ; then | 
					
						
							| 
									
										
										
										
											2016-08-25 12:19:43 +00:00
										 |  |  |       GLOBS=("${GLOBS[@]}" $(eval "$LS_PROGRAM" "$glob" 2>/dev/null)) | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |     fi | 
					
						
							|  |  |  |   done < "$YADM_ENCRYPT" | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-04-21 17:13:42 +00:00
										 |  |  |   #; report which files will be encrypted | 
					
						
							|  |  |  |   echo "Encrypting the following files:" | 
					
						
							| 
									
										
										
										
											2016-08-25 12:19:43 +00:00
										 |  |  |   "$LS_PROGRAM" -1 "${GLOBS[@]}" | 
					
						
							| 
									
										
										
										
											2016-04-21 17:13:42 +00:00
										 |  |  |   echo | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |   #; encrypt all files which match the globs | 
					
						
							| 
									
										
										
										
											2017-01-06 23:05:06 +00:00
										 |  |  |   if tar -f - -c "${GLOBS[@]}" | $GPG_PROGRAM --yes "${GPG_OPTS[@]}" --output "$YADM_ARCHIVE"; then | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |     echo "Wrote new file: $YADM_ARCHIVE" | 
					
						
							|  |  |  |   else | 
					
						
							|  |  |  |     error_out "Unable to write $YADM_ARCHIVE" | 
					
						
							|  |  |  |   fi | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-07-17 02:33:25 +00:00
										 |  |  |   #; offer to add YADM_ARCHIVE if untracked | 
					
						
							| 
									
										
										
										
											2017-01-09 01:04:40 +00:00
										 |  |  |   archive_status=$("$GIT_PROGRAM" status --porcelain -uall "$(mixed_path "$YADM_ARCHIVE")" 2>/dev/null) | 
					
						
							| 
									
										
										
										
											2015-07-17 02:33:25 +00:00
										 |  |  |   archive_regex="^\?\?" | 
					
						
							|  |  |  |   if [[ $archive_status =~ $archive_regex ]] ; then | 
					
						
							|  |  |  |     echo "It appears that $YADM_ARCHIVE is not tracked by yadm's repository." | 
					
						
							|  |  |  |     echo "Would you like to add it now? (y/n)" | 
					
						
							| 
									
										
										
										
											2017-01-27 22:58:20 +00:00
										 |  |  |     read -r answer < /dev/tty | 
					
						
							| 
									
										
										
										
											2015-07-17 02:33:25 +00:00
										 |  |  |     if [[ $answer =~ ^[yY]$ ]] ; then | 
					
						
							| 
									
										
										
										
											2017-01-09 01:04:40 +00:00
										 |  |  |       "$GIT_PROGRAM" add "$(mixed_path "$YADM_ARCHIVE")" | 
					
						
							| 
									
										
										
										
											2015-07-17 02:33:25 +00:00
										 |  |  |     fi | 
					
						
							|  |  |  |   fi | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |   CHANGES_POSSIBLE=1 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | function git_command() { | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   require_repo | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-02-13 23:30:33 +00:00
										 |  |  |   #; translate 'gitconfig' to 'config' -- 'config' is reserved for yadm | 
					
						
							|  |  |  |   if [ "$1" = "gitconfig" ] ; then | 
					
						
							|  |  |  |     set -- "config" "${@:2}" | 
					
						
							|  |  |  |   fi | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |   CHANGES_POSSIBLE=1 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   #; pass commands through to git | 
					
						
							| 
									
										
										
										
											2017-01-08 01:44:43 +00:00
										 |  |  |   "$GIT_PROGRAM" "$@" | 
					
						
							| 
									
										
										
										
											2017-01-06 22:27:24 +00:00
										 |  |  |   return "$?" | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | function help() { | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   cat << EOF | 
					
						
							| 
									
										
										
										
											2015-07-14 21:39:52 +00:00
										 |  |  | Usage: yadm <command> [options...] | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | Manage dotfiles maintained in a Git repository. Manage alternate files | 
					
						
							|  |  |  | for specific systems or hosts. Encrypt/decrypt private files. | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | Git Commands: | 
					
						
							| 
									
										
										
										
											2015-07-14 21:39:52 +00:00
										 |  |  | Any Git command or alias can be used as a <command>. It will operate | 
					
						
							|  |  |  | on yadm's repository and files in the work tree (usually \$HOME). | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | Commands: | 
					
						
							| 
									
										
										
										
											2015-07-14 21:39:52 +00:00
										 |  |  |   yadm init [-f]             - Initialize an empty repository | 
					
						
							|  |  |  |   yadm clone <url> [-f]      - Clone an existing repository | 
					
						
							|  |  |  |   yadm config <name> <value> - Configure a setting | 
					
						
							|  |  |  |   yadm list [-a]             - List tracked files | 
					
						
							|  |  |  |   yadm alt                   - Create links for alternates | 
					
						
							| 
									
										
										
										
											2017-02-01 00:00:06 +00:00
										 |  |  |   yadm bootstrap             - Execute \$HOME/.yadm/bootstrap | 
					
						
							| 
									
										
										
										
											2015-07-14 21:39:52 +00:00
										 |  |  |   yadm encrypt               - Encrypt files | 
					
						
							| 
									
										
										
										
											2015-07-17 01:57:53 +00:00
										 |  |  |   yadm decrypt [-l]          - Decrypt files | 
					
						
							| 
									
										
										
										
											2015-07-14 21:39:52 +00:00
										 |  |  |   yadm perms                 - Fix perms for private files | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | Files: | 
					
						
							|  |  |  |   \$HOME/.yadm/config    - yadm's configuration file | 
					
						
							|  |  |  |   \$HOME/.yadm/repo.git  - yadm's Git repository | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |   \$HOME/.yadm/encrypt   - List of globs used for encrypt/decrypt | 
					
						
							| 
									
										
										
										
											2015-07-17 01:57:53 +00:00
										 |  |  |   \$HOME/.yadm/files.gpg - Encrypted data stored here | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | Use "man yadm" for complete documentation. | 
					
						
							|  |  |  | EOF | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   exit 1 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | function init() { | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   #; safety check, don't attempt to init when the repo is already present | 
					
						
							|  |  |  |   [ -d "$YADM_REPO" ] && [ -z "$FORCE" ] && \ | 
					
						
							| 
									
										
										
										
											2016-03-24 00:14:25 +00:00
										 |  |  |     error_out "Git repo already exists. [$YADM_REPO]\nUse '-f' if you want to force it to be overwritten." | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |   #; remove existing if forcing the init to happen anyway | 
					
						
							|  |  |  |   [ -d "$YADM_REPO" ] && { | 
					
						
							|  |  |  |     debug "Removing existing repo prior to init" | 
					
						
							|  |  |  |     rm -rf "$YADM_REPO" | 
					
						
							|  |  |  |   } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   #; init a new bare repo | 
					
						
							|  |  |  |   debug "Init new repo" | 
					
						
							| 
									
										
										
										
											2017-01-09 01:04:40 +00:00
										 |  |  |   "$GIT_PROGRAM" init --shared=0600 --bare "$(mixed_path "$YADM_REPO")" "$@" | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |   configure_repo | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   CHANGES_POSSIBLE=1 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | function list() { | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   require_repo | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   #; process relative to YADM_WORK when --all is specified | 
					
						
							|  |  |  |   if [ -n "$LIST_ALL" ] ; then | 
					
						
							| 
									
										
										
										
											2017-01-09 01:04:40 +00:00
										 |  |  |     YADM_WORK=$(unix_path "$("$GIT_PROGRAM" config core.worktree)") | 
					
						
							| 
									
										
										
										
											2016-04-05 13:52:21 +00:00
										 |  |  |     cd "$YADM_WORK" || { | 
					
						
							|  |  |  |       debug "List not processed, unable to cd to $YADM_WORK" | 
					
						
							|  |  |  |       return | 
					
						
							|  |  |  |     } | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |   fi | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   #; list tracked files | 
					
						
							| 
									
										
										
										
											2017-01-08 01:44:43 +00:00
										 |  |  |   "$GIT_PROGRAM" ls-files | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | function perms() { | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-08-25 12:19:43 +00:00
										 |  |  |   require_ls | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |   #; TODO: prevent repeats in the files changed | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   #; process relative to YADM_WORK | 
					
						
							| 
									
										
										
										
											2017-01-09 01:04:40 +00:00
										 |  |  |   YADM_WORK=$(unix_path "$("$GIT_PROGRAM" config core.worktree)") | 
					
						
							| 
									
										
										
										
											2016-04-05 13:52:21 +00:00
										 |  |  |   cd "$YADM_WORK" || { | 
					
						
							|  |  |  |     debug "Perms not processed, unable to cd to $YADM_WORK" | 
					
						
							|  |  |  |     return | 
					
						
							|  |  |  |   } | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |   GLOBS=() | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   #; include the archive created by "encrypt" | 
					
						
							|  |  |  |   [ -f "$YADM_ARCHIVE" ] && GLOBS=("${GLOBS[@]}" "$YADM_ARCHIVE") | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   #; include all .ssh files (unless disabled) | 
					
						
							| 
									
										
										
										
											2015-07-14 21:39:52 +00:00
										 |  |  |   if [[ $(config --bool yadm.ssh-perms) != "false" ]] ; then | 
					
						
							| 
									
										
										
										
											2015-07-16 22:11:29 +00:00
										 |  |  |     GLOBS=("${GLOBS[@]}" ".ssh" ".ssh/*") | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |   fi | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-08-07 12:18:22 +00:00
										 |  |  |   #; include all gpg files (unless disabled) | 
					
						
							|  |  |  |   if [[ $(config --bool yadm.gpg-perms) != "false" ]] ; then | 
					
						
							|  |  |  |     GLOBS=("${GLOBS[@]}" ".gnupg" ".gnupg/*") | 
					
						
							|  |  |  |   fi | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |   #; include globs found in YADM_ENCRYPT (if present) | 
					
						
							|  |  |  |   if [ -f "$YADM_ENCRYPT" ] ; then | 
					
						
							|  |  |  |     while IFS='' read -r glob || [ -n "$glob" ]; do | 
					
						
							|  |  |  |       if [[ ! $glob =~ ^# ]] ; then | 
					
						
							| 
									
										
										
										
											2016-08-25 12:19:43 +00:00
										 |  |  |         GLOBS=("${GLOBS[@]}" $(eval "$LS_PROGRAM" "$glob" 2>/dev/null)) | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |       fi | 
					
						
							|  |  |  |     done < "$YADM_ENCRYPT" | 
					
						
							|  |  |  |   fi | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   #; remove group/other permissions from collected globs | 
					
						
							| 
									
										
										
										
											2016-04-05 13:52:21 +00:00
										 |  |  |   #shellcheck disable=SC2068 | 
					
						
							|  |  |  |   #(SC2068 is disabled because in this case, we desire globbing) | 
					
						
							| 
									
										
										
										
											2015-07-14 14:57:45 +00:00
										 |  |  |   chmod -f go-rwx ${GLOBS[@]} >/dev/null 2>&1 | 
					
						
							|  |  |  |   #; TODO: detect and report changing permissions in a portable way | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | function version() { | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   echo "yadm $VERSION" | 
					
						
							|  |  |  |   exit 0 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #; ****** Utility Functions ****** | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-03-23 07:41:12 +00:00
										 |  |  | function process_global_args() { | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   #; global arguments are removed before the main processing is done | 
					
						
							|  |  |  |   MAIN_ARGS=() | 
					
						
							| 
									
										
										
										
											2016-04-05 13:52:21 +00:00
										 |  |  |   while [[ $# -gt 0 ]] ; do | 
					
						
							| 
									
										
										
										
											2016-03-23 07:41:12 +00:00
										 |  |  |     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 | 
					
						
							|  |  |  |       ;; | 
					
						
							| 
									
										
										
										
											2016-04-08 22:21:38 +00:00
										 |  |  |       --yadm-repo) #; override the standard YADM_REPO | 
					
						
							|  |  |  |         if [[ ! "$2" =~ ^/ ]] ; then | 
					
						
							|  |  |  |           error_out "You must specify a fully qualified repo path" | 
					
						
							|  |  |  |         fi | 
					
						
							|  |  |  |         YADM_OVERRIDE_REPO="$2" | 
					
						
							|  |  |  |         shift | 
					
						
							|  |  |  |       ;; | 
					
						
							|  |  |  |       --yadm-config) #; override the standard YADM_CONFIG | 
					
						
							|  |  |  |         if [[ ! "$2" =~ ^/ ]] ; then | 
					
						
							|  |  |  |           error_out "You must specify a fully qualified config path" | 
					
						
							|  |  |  |         fi | 
					
						
							|  |  |  |         YADM_OVERRIDE_CONFIG="$2" | 
					
						
							|  |  |  |         shift | 
					
						
							|  |  |  |       ;; | 
					
						
							|  |  |  |       --yadm-encrypt) #; override the standard YADM_ENCRYPT | 
					
						
							|  |  |  |         if [[ ! "$2" =~ ^/ ]] ; then | 
					
						
							|  |  |  |           error_out "You must specify a fully qualified encrypt path" | 
					
						
							|  |  |  |         fi | 
					
						
							|  |  |  |         YADM_OVERRIDE_ENCRYPT="$2" | 
					
						
							|  |  |  |         shift | 
					
						
							|  |  |  |       ;; | 
					
						
							|  |  |  |       --yadm-archive) #; override the standard YADM_ARCHIVE | 
					
						
							|  |  |  |         if [[ ! "$2" =~ ^/ ]] ; then | 
					
						
							|  |  |  |           error_out "You must specify a fully qualified archive path" | 
					
						
							|  |  |  |         fi | 
					
						
							|  |  |  |         YADM_OVERRIDE_ARCHIVE="$2" | 
					
						
							|  |  |  |         shift | 
					
						
							|  |  |  |       ;; | 
					
						
							| 
									
										
										
										
											2017-01-23 23:23:06 +00:00
										 |  |  |       --yadm-bootstrap) #; override the standard YADM_BOOTSTRAP | 
					
						
							|  |  |  |         if [[ ! "$2" =~ ^/ ]] ; then | 
					
						
							|  |  |  |           error_out "You must specify a fully qualified bootstrap path" | 
					
						
							|  |  |  |         fi | 
					
						
							|  |  |  |         YADM_OVERRIDE_BOOTSTRAP="$2" | 
					
						
							|  |  |  |         shift | 
					
						
							|  |  |  |       ;; | 
					
						
							| 
									
										
										
										
											2016-03-23 07:41:12 +00:00
										 |  |  |       *) #; 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" | 
					
						
							| 
									
										
										
										
											2017-01-23 23:23:06 +00:00
										 |  |  |   YADM_BOOTSTRAP="$YADM_DIR/$YADM_BOOTSTRAP" | 
					
						
							| 
									
										
										
										
											2016-03-23 07:41:12 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-04-08 22:21:38 +00:00
										 |  |  |   #; independent overrides for paths | 
					
						
							|  |  |  |   if [ -n "$YADM_OVERRIDE_REPO" ]; then | 
					
						
							|  |  |  |     YADM_REPO="$YADM_OVERRIDE_REPO" | 
					
						
							|  |  |  |   fi | 
					
						
							|  |  |  |   if [ -n "$YADM_OVERRIDE_CONFIG" ]; then | 
					
						
							|  |  |  |     YADM_CONFIG="$YADM_OVERRIDE_CONFIG" | 
					
						
							|  |  |  |   fi | 
					
						
							|  |  |  |   if [ -n "$YADM_OVERRIDE_ENCRYPT" ]; then | 
					
						
							|  |  |  |     YADM_ENCRYPT="$YADM_OVERRIDE_ENCRYPT" | 
					
						
							|  |  |  |   fi | 
					
						
							|  |  |  |   if [ -n "$YADM_OVERRIDE_ARCHIVE" ]; then | 
					
						
							|  |  |  |     YADM_ARCHIVE="$YADM_OVERRIDE_ARCHIVE" | 
					
						
							|  |  |  |   fi | 
					
						
							| 
									
										
										
										
											2017-01-23 23:23:06 +00:00
										 |  |  |   if [ -n "$YADM_OVERRIDE_BOOTSTRAP" ]; then | 
					
						
							|  |  |  |     YADM_BOOTSTRAP="$YADM_OVERRIDE_BOOTSTRAP" | 
					
						
							|  |  |  |   fi | 
					
						
							| 
									
										
										
										
											2016-04-08 22:21:38 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-03-23 07:41:12 +00:00
										 |  |  |   #; use the yadm repo for all git operations | 
					
						
							| 
									
										
										
										
											2017-01-09 01:04:40 +00:00
										 |  |  |   GIT_DIR=$(mixed_path "$YADM_REPO") | 
					
						
							| 
									
										
										
										
											2016-10-09 17:24:31 +00:00
										 |  |  |   export GIT_DIR | 
					
						
							| 
									
										
										
										
											2016-03-23 07:41:12 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | function configure_repo() { | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   debug "Configuring new repo" | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   #; change bare to false (there is a working directory) | 
					
						
							| 
									
										
										
										
											2017-01-08 01:44:43 +00:00
										 |  |  |   "$GIT_PROGRAM" config core.bare 'false' | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-07-14 21:39:52 +00:00
										 |  |  |   #; set the worktree for the yadm repo | 
					
						
							| 
									
										
										
										
											2017-01-09 01:04:40 +00:00
										 |  |  |   "$GIT_PROGRAM" config core.worktree "$(mixed_path "$YADM_WORK")" | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-07-26 15:59:13 +00:00
										 |  |  |   #; by default, do not show untracked files and directories | 
					
						
							| 
									
										
										
										
											2017-01-08 01:44:43 +00:00
										 |  |  |   "$GIT_PROGRAM" config status.showUntrackedFiles no | 
					
						
							| 
									
										
										
										
											2015-07-26 15:59:13 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-07-14 21:39:52 +00:00
										 |  |  |   #; possibly used later to ensure we're working on the yadm repo | 
					
						
							| 
									
										
										
										
											2017-01-08 01:44:43 +00:00
										 |  |  |   "$GIT_PROGRAM" config yadm.managed 'true' | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | function debug() { | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-04-05 13:52:21 +00:00
										 |  |  |   [ -n "$DEBUG" ] && echo -e "DEBUG: $*" | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | function error_out() { | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-04-05 13:52:21 +00:00
										 |  |  |   echo -e "ERROR: $*" | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |   exit 1 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #; ****** Auto Functions ****** | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | function auto_alt() { | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   #; process alternates if there are possible changes | 
					
						
							| 
									
										
										
										
											2015-07-17 21:21:47 +00:00
										 |  |  |   if [ "$CHANGES_POSSIBLE" = "1" ] ; then | 
					
						
							| 
									
										
										
										
											2015-07-14 21:39:52 +00:00
										 |  |  |     auto_alt=$(config --bool yadm.auto-alt) | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |     if [ "$auto_alt" != "false" ] ; then | 
					
						
							| 
									
										
										
										
											2017-01-21 17:41:14 +00:00
										 |  |  |       [ -d "$YADM_REPO" ] && alt | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |     fi | 
					
						
							|  |  |  |   fi | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | function auto_perms() { | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   #; process permissions if there are possible changes | 
					
						
							| 
									
										
										
										
											2015-07-17 21:21:47 +00:00
										 |  |  |   if [ "$CHANGES_POSSIBLE" = "1" ] ; then | 
					
						
							| 
									
										
										
										
											2015-07-14 21:39:52 +00:00
										 |  |  |     auto_perms=$(config --bool yadm.auto-perms) | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |     if [ "$auto_perms" != "false" ] ; then | 
					
						
							| 
									
										
										
										
											2017-01-21 17:41:14 +00:00
										 |  |  |       [ -d "$YADM_REPO" ] && perms | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  |     fi | 
					
						
							|  |  |  |   fi | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-01-25 07:07:07 +00:00
										 |  |  | function auto_bootstrap() { | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   bootstrap_available || return | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   [ "$DO_BOOTSTRAP" -eq 0 ] && return | 
					
						
							|  |  |  |   [ "$DO_BOOTSTRAP" -eq 3 ] && return | 
					
						
							|  |  |  |   [ "$DO_BOOTSTRAP" -eq 2 ] && bootstrap | 
					
						
							|  |  |  |   if [ "$DO_BOOTSTRAP" -eq 1 ] ; then | 
					
						
							|  |  |  |     echo "Found $YADM_BOOTSTRAP" | 
					
						
							|  |  |  |     echo "It appears that a bootstrap program exists." | 
					
						
							|  |  |  |     echo "Would you like to execute it now? (y/n)" | 
					
						
							| 
									
										
										
										
											2017-01-27 22:58:20 +00:00
										 |  |  |     read -r answer < /dev/tty | 
					
						
							| 
									
										
										
										
											2017-01-25 07:07:07 +00:00
										 |  |  |     if [[ $answer =~ ^[yY]$ ]] ; then | 
					
						
							|  |  |  |       bootstrap | 
					
						
							|  |  |  |     fi | 
					
						
							|  |  |  |   fi | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | #; ****** Prerequisites Functions ****** | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | function require_archive() { | 
					
						
							|  |  |  |   [ -f "$YADM_ARCHIVE" ] || error_out "$YADM_ARCHIVE does not exist. did you forget to create it?" | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | function require_encrypt() { | 
					
						
							|  |  |  |   [ -f "$YADM_ENCRYPT" ] || error_out "$YADM_ENCRYPT does not exist. did you forget to create it?" | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | function require_git() { | 
					
						
							| 
									
										
										
										
											2017-01-08 01:44:43 +00:00
										 |  |  |   local alt_git | 
					
						
							|  |  |  |   alt_git="$(config yadm.git-program)" | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   local more_info | 
					
						
							|  |  |  |   more_info="" | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   if [ "$alt_git" != "" ] ; then | 
					
						
							|  |  |  |     GIT_PROGRAM="$alt_git" | 
					
						
							|  |  |  |     more_info="\nThis command has been set via the yadm.git-program configuration." | 
					
						
							|  |  |  |   fi | 
					
						
							|  |  |  |   command -v "$GIT_PROGRAM" >/dev/null 2>&1 || \ | 
					
						
							|  |  |  |     error_out "This functionality requires Git to be installed, but the command '$GIT_PROGRAM' cannot be located.$more_info" | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | } | 
					
						
							|  |  |  | function require_gpg() { | 
					
						
							| 
									
										
										
										
											2016-08-13 22:17:16 +00:00
										 |  |  |   local alt_gpg | 
					
						
							|  |  |  |   alt_gpg="$(config yadm.gpg-program)" | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   local more_info | 
					
						
							|  |  |  |   more_info="" | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |   if [ "$alt_gpg" != "" ] ; then | 
					
						
							|  |  |  |     GPG_PROGRAM="$alt_gpg" | 
					
						
							|  |  |  |     more_info="\nThis command has been set via the yadm.gpg-program configuration." | 
					
						
							|  |  |  |   fi | 
					
						
							|  |  |  |   command -v "$GPG_PROGRAM" >/dev/null 2>&1 || \ | 
					
						
							|  |  |  |     error_out "This functionality requires GPG to be installed, but the command '$GPG_PROGRAM' cannot be located.$more_info" | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | } | 
					
						
							|  |  |  | function require_repo() { | 
					
						
							|  |  |  |   [ -d "$YADM_REPO" ] || error_out "Git repo does not exist. did you forget to run 'init' or 'clone'?" | 
					
						
							|  |  |  | } | 
					
						
							| 
									
										
										
										
											2016-08-25 12:19:43 +00:00
										 |  |  | function require_ls() { | 
					
						
							|  |  |  |   if [ ! -f "$LS_PROGRAM" ] ; then | 
					
						
							|  |  |  |     command -v ls >/dev/null 2>&1 || \ | 
					
						
							|  |  |  |       error_out "This functionality requires 'ls' to be installed at '$LS_PROGRAM' or listed in your \$PATH" | 
					
						
							|  |  |  |     LS_PROGRAM=ls | 
					
						
							|  |  |  |   fi | 
					
						
							|  |  |  | } | 
					
						
							| 
									
										
										
										
											2017-01-23 23:23:06 +00:00
										 |  |  | function bootstrap_available() { | 
					
						
							|  |  |  |   [ -f "$YADM_BOOTSTRAP" ] && [ -x "$YADM_BOOTSTRAP" ] && return | 
					
						
							|  |  |  |   return 1 | 
					
						
							|  |  |  | } | 
					
						
							| 
									
										
										
										
											2015-07-14 12:48:47 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-01-09 01:04:40 +00:00
										 |  |  | #; ****** Directory tranlations ****** | 
					
						
							| 
									
										
										
										
											2016-10-09 17:24:31 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-01-09 01:04:40 +00:00
										 |  |  | function test_cygwin() { | 
					
						
							|  |  |  |   case "$(uname -s)" in | 
					
						
							|  |  |  |     CYGWIN*) | 
					
						
							|  |  |  |       git_version=$(git --version 2>/dev/null) | 
					
						
							|  |  |  |       if [[ "$git_version" =~ windows ]] ; then | 
					
						
							|  |  |  | 	      USE_CYGPATH=1 | 
					
						
							|  |  |  |       fi | 
					
						
							|  |  |  |       ;; | 
					
						
							|  |  |  |     *) | 
					
						
							|  |  |  |       ;; | 
					
						
							|  |  |  |   esac | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | function unix_path() { | 
					
						
							|  |  |  |   #; for paths used by bash/yadm | 
					
						
							|  |  |  |   if [ "$USE_CYGPATH" = "1" ] ; then | 
					
						
							| 
									
										
										
										
											2016-10-09 17:24:31 +00:00
										 |  |  |     cygpath -u "$1" | 
					
						
							|  |  |  |   else | 
					
						
							|  |  |  |     echo "$1" | 
					
						
							|  |  |  |   fi | 
					
						
							|  |  |  | } | 
					
						
							| 
									
										
										
										
											2017-01-09 01:04:40 +00:00
										 |  |  | function mixed_path() { | 
					
						
							|  |  |  |   #; for paths used by Git | 
					
						
							|  |  |  |   if [ "$USE_CYGPATH" = "1" ] ; then | 
					
						
							| 
									
										
										
										
											2016-10-09 17:24:31 +00:00
										 |  |  |     cygpath -m "$1" | 
					
						
							|  |  |  |   else | 
					
						
							|  |  |  |     echo "$1" | 
					
						
							|  |  |  |   fi | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-03-24 00:16:21 +00:00
										 |  |  | #; ****** Main processing (when not unit testing) ****** | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | if [ "$YADM_TEST" != 1 ] ; then | 
					
						
							|  |  |  |   process_global_args "$@" | 
					
						
							| 
									
										
										
										
											2017-01-09 01:04:40 +00:00
										 |  |  |   test_cygwin | 
					
						
							| 
									
										
										
										
											2016-03-24 00:16:21 +00:00
										 |  |  |   configure_paths | 
					
						
							|  |  |  |   main "${MAIN_ARGS[@]}" | 
					
						
							|  |  |  | fi |