2012-12-02 22:26:02 +00:00
|
|
|
#!/usr/bin/env bash
|
2012-10-20 11:49:53 +00:00
|
|
|
#
|
|
|
|
# gitwatch - watch file or directory and git commit all changes as they happen
|
|
|
|
#
|
2014-07-05 14:58:54 +00:00
|
|
|
# Copyright (C) 2013-2014 Patrick Lehner
|
2012-11-27 19:10:16 +00:00
|
|
|
# with modifications and contributions by:
|
|
|
|
# - Matthew McGowan
|
2012-12-03 21:30:15 +00:00
|
|
|
# - Dominik D. Geyer
|
2014-07-05 14:58:54 +00:00
|
|
|
# - Phil Thompson
|
2012-10-20 11:49:53 +00:00
|
|
|
#
|
|
|
|
#############################################################################
|
|
|
|
# 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, either version 3 of the License, or
|
|
|
|
# (at your option) any later version.
|
|
|
|
#
|
|
|
|
# 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/>.
|
|
|
|
#############################################################################
|
|
|
|
#
|
|
|
|
# Idea and original code taken from http://stackoverflow.com/a/965274
|
|
|
|
# (but heavily modified by now)
|
|
|
|
#
|
|
|
|
# Requires the command 'inotifywait' to be available, which is part of
|
2012-11-30 23:58:17 +00:00
|
|
|
# the inotify-tools (See https://github.com/rvoicilas/inotify-tools ),
|
2013-04-24 08:22:35 +00:00
|
|
|
# and (obviously) git.
|
|
|
|
# Will check the availability of both commands using the `which` command
|
|
|
|
# and will abort if either command (or `which`) is not found.
|
2012-10-20 11:49:53 +00:00
|
|
|
#
|
|
|
|
|
2012-11-28 00:02:11 +00:00
|
|
|
REMOTE=""
|
2013-04-18 20:15:29 +00:00
|
|
|
BRANCH=""
|
2013-04-15 21:01:37 +00:00
|
|
|
SLEEP_TIME=2
|
2013-04-16 16:26:07 +00:00
|
|
|
DATE_FMT="+%Y-%m-%d %H:%M:%S"
|
2013-04-18 19:10:48 +00:00
|
|
|
COMMITMSG="Scripted auto-commit on change (%d) by gitwatch.sh"
|
2014-07-02 13:47:17 +00:00
|
|
|
EVENTS="close_write,move,delete,create"
|
2012-11-28 00:02:11 +00:00
|
|
|
|
2013-11-13 09:57:29 +00:00
|
|
|
# Print a message about how to use this script
|
|
|
|
shelp () {
|
2012-11-30 23:58:17 +00:00
|
|
|
echo "gitwatch - watch file or directory and git commit all changes as they happen"
|
|
|
|
echo ""
|
|
|
|
echo "Usage:"
|
2013-04-18 19:27:06 +00:00
|
|
|
echo "${0##*/} [-s <secs>] [-d <fmt>] [-r <remote> [-b <branch>]]"
|
|
|
|
echo " [-m <msg>] <target>"
|
2012-11-30 23:58:17 +00:00
|
|
|
echo ""
|
|
|
|
echo "Where <target> is the file or folder which should be watched. The target needs"
|
2013-04-18 19:27:06 +00:00
|
|
|
echo "to be in a Git repository, or in the case of a folder, it may also be the top"
|
2012-11-30 23:58:17 +00:00
|
|
|
echo "folder of the repo."
|
2013-04-15 21:01:37 +00:00
|
|
|
echo ""
|
|
|
|
echo " -s <secs> after detecting a change to the watched file or directory,"
|
|
|
|
echo " wait <secs> seconds until committing, to allow for more"
|
|
|
|
echo " write actions of the same batch to finish; default is 2sec"
|
2013-04-16 16:26:07 +00:00
|
|
|
echo " -d <fmt> the format string used for the timestamp in the commit"
|
|
|
|
echo " message; see 'man date' for details; default is "
|
2013-04-18 19:27:06 +00:00
|
|
|
echo " \"+%Y-%m-%d %H:%M:%S\""
|
2013-04-16 16:47:35 +00:00
|
|
|
echo " -r <remote> if defined, a 'git push' to the given <remote> is done after"
|
|
|
|
echo " every commit"
|
2013-04-18 20:15:29 +00:00
|
|
|
echo " -b <branch> the branch which should be pushed automatically;"
|
|
|
|
echo " - if not given, the push command used is 'git push <remote>',"
|
|
|
|
echo " thus doing a default push (see git man pages for details)"
|
|
|
|
echo " - if given and"
|
|
|
|
echo " + repo is in a detached HEAD state (at launch)"
|
|
|
|
echo " then the command used is 'git push <remote> <branch>'"
|
|
|
|
echo " + repo is NOT in a detached HEAD state (at launch)"
|
|
|
|
echo " then the command used is"
|
|
|
|
echo " 'git push <remote> <current branch>:<branch>' where"
|
|
|
|
echo " <current branch> is the target of HEAD (at launch)"
|
|
|
|
echo " if no remote was define with -r, this option has no effect"
|
2013-04-18 19:27:06 +00:00
|
|
|
echo " -m <msg> the commit message used for each commit; all occurences of"
|
|
|
|
echo " %d in the string will be replaced by the formatted date/time"
|
|
|
|
echo " (unless the <fmt> specified by -d is empty, in which case %d"
|
|
|
|
echo " is replaced by an empty string); the default message is:"
|
|
|
|
echo " \"Scripted auto-commit on change (%d) by gitwatch.sh\""
|
2014-07-02 13:47:17 +00:00
|
|
|
echo " -e <events> events passed to inotifywait to watch (defaults to "
|
|
|
|
echo " $FILE_EVENTS)"
|
|
|
|
echo " (useful when using inotify-win, e.g. -e modify,delete,move)"
|
|
|
|
echo " dir events are file events plus 'create'"
|
2013-04-18 20:15:29 +00:00
|
|
|
echo ""
|
|
|
|
echo "As indicated, several conditions are only checked once at launch of the"
|
|
|
|
echo "script. You can make changes to the repo state and configurations even while"
|
|
|
|
echo "the script is running, but that may lead to undefined and unpredictable (even"
|
|
|
|
echo "destructive) behavior!"
|
|
|
|
echo "It is therefore recommended to terminate the script before changin the repo's"
|
|
|
|
echo "config and restarting it afterwards."
|
2013-04-25 15:05:55 +00:00
|
|
|
echo ""
|
|
|
|
echo "By default, gitwatch tries to use the binaries \"git\" and \"inotifywait\","
|
|
|
|
echo "expecting to find them in the PATH (it uses 'which' to check this and will"
|
|
|
|
echo "abort with an error if they cannot be found). If you want to use binaries"
|
|
|
|
echo "that are named differently and/or located outside of your PATH, you can define"
|
|
|
|
echo "replacements in the environment variables GW_GIT_BIN and GW_INW_BIN for git"
|
|
|
|
echo "and inotifywait, respectively."
|
2012-11-27 20:03:31 +00:00
|
|
|
}
|
|
|
|
|
2013-11-13 09:57:29 +00:00
|
|
|
# print all arguments to stderr
|
2013-04-24 14:22:51 +00:00
|
|
|
stderr () {
|
2013-04-25 21:12:50 +00:00
|
|
|
echo $@ >&2
|
2013-04-24 14:22:51 +00:00
|
|
|
}
|
|
|
|
|
2013-11-13 09:57:29 +00:00
|
|
|
# clean up at end of program, killing the remaining sleep process if it still exists
|
2013-04-25 21:12:50 +00:00
|
|
|
cleanup () {
|
|
|
|
if [[ -n "$SLEEP_PID" ]] && kill -0 $SLEEP_PID &>/dev/null; then
|
|
|
|
kill $SLEEP_PID &>/dev/null
|
|
|
|
fi
|
|
|
|
exit 0
|
|
|
|
}
|
|
|
|
|
2013-11-13 09:57:29 +00:00
|
|
|
# Tests for the availability of a command
|
|
|
|
is_command () {
|
|
|
|
which "$1" &>/dev/null
|
|
|
|
}
|
|
|
|
|
2013-04-25 21:12:50 +00:00
|
|
|
###############################################################################
|
|
|
|
|
2014-07-02 13:47:17 +00:00
|
|
|
while getopts b:d:hm:p:r:s:e: option # Process command line options
|
2012-11-28 00:02:11 +00:00
|
|
|
do
|
2012-11-30 23:30:57 +00:00
|
|
|
case "${option}" in
|
2012-11-30 23:35:08 +00:00
|
|
|
b) BRANCH=${OPTARG};;
|
2013-04-16 16:26:07 +00:00
|
|
|
d) DATE_FMT=${OPTARG};;
|
2012-11-30 23:30:57 +00:00
|
|
|
h) shelp; exit;;
|
2013-04-18 19:27:06 +00:00
|
|
|
m) COMMITMSG=${OPTARG};;
|
2013-04-16 16:47:35 +00:00
|
|
|
p|r) REMOTE=${OPTARG};;
|
2013-04-15 21:01:37 +00:00
|
|
|
s) SLEEP_TIME=${OPTARG};;
|
2014-07-02 13:47:17 +00:00
|
|
|
e) EVENTS=${OPTARG};;
|
2012-11-28 00:02:11 +00:00
|
|
|
esac
|
2012-11-30 23:15:48 +00:00
|
|
|
done
|
2012-11-28 00:02:11 +00:00
|
|
|
|
2012-11-30 23:35:08 +00:00
|
|
|
shift $((OPTIND-1)) # Shift the input arguments, so that the input file (last arg) is $1 in the code below
|
2012-11-30 23:30:57 +00:00
|
|
|
|
2012-12-03 21:30:15 +00:00
|
|
|
if [ $# -ne 1 ]; then # If no command line arguments are left (that's bad: no target was passed)
|
|
|
|
shelp # print usage help
|
|
|
|
exit # and exit
|
2012-12-02 23:20:49 +00:00
|
|
|
fi
|
|
|
|
|
2013-04-24 14:22:51 +00:00
|
|
|
# if custom bin names are given for git or inotifywait, use those; otherwise fall back to "git" and "inotifywait"
|
2013-04-24 14:17:24 +00:00
|
|
|
if [ -z "$GW_GIT_BIN" ]; then GIT="git"; else GIT="$GW_GIT_BIN"; fi
|
|
|
|
if [ -z "$GW_INW_BIN" ]; then INW="inotifywait"; else INW="$GW_INW_BIN"; fi
|
|
|
|
|
2013-04-24 14:22:51 +00:00
|
|
|
# Check availability of selected binaries and die if not met
|
2013-04-24 14:17:24 +00:00
|
|
|
for cmd in "$GIT" "$INW"; do
|
2013-04-25 21:12:50 +00:00
|
|
|
is_command "$cmd" || { stderr "Error: Required command '$cmd' not found." ; exit 1; }
|
2012-12-03 19:17:27 +00:00
|
|
|
done
|
|
|
|
unset cmd
|
2012-11-27 09:04:20 +00:00
|
|
|
|
2013-04-25 21:12:50 +00:00
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
SLEEP_PID="" # pid of timeout subprocess
|
|
|
|
|
|
|
|
trap "cleanup" EXIT # make sure the timeout is killed when exiting script
|
|
|
|
|
|
|
|
|
2013-04-24 08:22:35 +00:00
|
|
|
# Expand the path to the target to absolute path
|
2012-10-20 11:49:53 +00:00
|
|
|
IN=$(readlink -f "$1")
|
|
|
|
|
2013-04-25 21:12:50 +00:00
|
|
|
if [ -d "$1" ]; then # if the target is a directory
|
2012-12-02 23:29:26 +00:00
|
|
|
TARGETDIR=$(sed -e "s/\/*$//" <<<"$IN") # dir to CD into before using git commands: trim trailing slash, if any
|
2014-07-05 15:00:11 +00:00
|
|
|
INCOMMAND="\"$INW\" -qmr -e \"$EVENTS\" --exclude \"\.git\" \"$TARGETDIR\"" # construct inotifywait-commandline
|
2013-11-13 10:02:56 +00:00
|
|
|
GIT_ADD_ARGS="--all ." # add "." (CWD) recursively to index
|
|
|
|
GIT_COMMIT_ARGS="" # add -a switch to "commit" call just to be sure
|
2013-04-25 21:12:50 +00:00
|
|
|
elif [ -f "$1" ]; then # if the target is a single file
|
2012-12-03 19:00:08 +00:00
|
|
|
TARGETDIR=$(dirname "$IN") # dir to CD into before using git commands: extract from file name
|
2014-07-05 15:00:11 +00:00
|
|
|
INCOMMAND="\"$INW\" -qm -e \"$EVENTS\" \"$IN\"" # construct inotifywait-commandline
|
2013-04-25 15:05:55 +00:00
|
|
|
GIT_ADD_ARGS="$IN" # add only the selected file to index
|
2013-04-24 08:22:35 +00:00
|
|
|
GIT_COMMIT_ARGS="" # no need to add anything more to "commit" call
|
2012-10-20 11:49:53 +00:00
|
|
|
else
|
2013-04-24 14:22:51 +00:00
|
|
|
stderr "Error: The target is neither a regular file nor a directory."
|
2012-12-02 23:03:51 +00:00
|
|
|
exit 1
|
2012-10-20 11:49:53 +00:00
|
|
|
fi
|
|
|
|
|
2013-04-24 14:35:42 +00:00
|
|
|
# Check if commit message needs any formatting (date splicing)
|
|
|
|
if ! grep "%d" > /dev/null <<< "$COMMITMSG"; then # if commitmsg didnt contain %d, grep returns non-zero
|
|
|
|
DATE_FMT="" # empty date format (will disable splicing in the main loop)
|
|
|
|
FORMATTED_COMMITMSG="$COMMITMSG" # save (unchanging) commit message
|
|
|
|
fi
|
|
|
|
|
2013-04-25 21:12:50 +00:00
|
|
|
cd "$TARGETDIR" # CD into right dir
|
2013-04-18 20:15:29 +00:00
|
|
|
|
2013-04-24 14:35:42 +00:00
|
|
|
if [ -n "$REMOTE" ]; then # are we pushing to a remote?
|
|
|
|
if [ -z "$BRANCH" ]; then # Do we have a branch set to push to ?
|
2013-04-25 21:12:50 +00:00
|
|
|
PUSH_CMD="'$GIT' push $REMOTE" # Branch not set, push to remote without a branch
|
2013-04-24 14:35:42 +00:00
|
|
|
else
|
|
|
|
# check if we are on a detached HEAD
|
|
|
|
HEADREF=$(git symbolic-ref HEAD 2> /dev/null)
|
|
|
|
if [ $? -eq 0 ]; then # HEAD is not detached
|
2013-04-25 21:12:50 +00:00
|
|
|
PUSH_CMD="'$GIT' push $REMOTE $(sed "s_^refs/heads/__" <<< "$HEADREF"):$BRANCH"
|
2013-04-24 14:35:42 +00:00
|
|
|
else # HEAD is detached
|
2013-04-25 21:12:50 +00:00
|
|
|
PUSH_CMD="'$GIT' push $REMOTE $BRANCH"
|
2013-04-24 14:35:42 +00:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
PUSH_CMD="" # if not remote is selected, make sure push command is empty
|
2013-04-18 20:15:29 +00:00
|
|
|
fi
|
|
|
|
|
2013-04-25 21:12:50 +00:00
|
|
|
###############################################################################
|
|
|
|
|
2013-04-24 08:22:35 +00:00
|
|
|
# main program loop: wait for changes and commit them
|
2013-11-13 09:57:29 +00:00
|
|
|
# whenever inotifywait reports a change, we spawn a timer (sleep process) that gives the writing
|
|
|
|
# process some time (in case there are a lot of changes or w/e); if there is already a timer
|
|
|
|
# running when we receive an event, we kill it and start a new one; thus we only commit if there
|
|
|
|
# have been no changes reported during a whole timeout period
|
2014-07-03 08:35:30 +00:00
|
|
|
eval $INCOMMAND | while read -r line; do
|
2013-04-25 21:12:50 +00:00
|
|
|
# is there already a timeout process running?
|
|
|
|
if [[ -n "$SLEEP_PID" ]] && kill -0 $SLEEP_PID &>/dev/null; then
|
|
|
|
# kill it and wait for completion
|
|
|
|
kill $SLEEP_PID &>/dev/null || true
|
|
|
|
wait $SLEEP_PID &>/dev/null || true
|
2013-04-18 19:10:48 +00:00
|
|
|
fi
|
2012-11-28 00:02:11 +00:00
|
|
|
|
2013-04-25 21:12:50 +00:00
|
|
|
# start timeout process
|
|
|
|
(
|
|
|
|
sleep $SLEEP_TIME # wait some more seconds to give apps time to write out all changes
|
|
|
|
|
|
|
|
if [ -n "$DATE_FMT" ]; then
|
|
|
|
FORMATTED_COMMITMSG="$(sed "s/%d/$(date "$DATE_FMT")/" <<< "$COMMITMSG")" # splice the formatted date-time into the commit message
|
|
|
|
fi
|
|
|
|
cd "$TARGETDIR" # CD into right dir
|
2014-07-03 08:35:30 +00:00
|
|
|
"$GIT" add $GIT_ADD_ARGS # add file(s) to index
|
2013-04-25 21:12:50 +00:00
|
|
|
"$GIT" commit $GIT_COMMIT_ARGS -m"$FORMATTED_COMMITMSG" # construct commit message and commit
|
|
|
|
|
|
|
|
if [ -n "$PUSH_CMD" ]; then eval $PUSH_CMD; fi
|
2013-11-13 09:57:29 +00:00
|
|
|
) & # and send into background
|
2013-04-25 21:12:50 +00:00
|
|
|
|
|
|
|
SLEEP_PID=$! # and remember its PID
|
2014-07-03 08:35:30 +00:00
|
|
|
done
|