vitalif
/
grive2
mirror of https://github.com/vitalif/grive2
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #177 from psfloyd/master 

Fix for systemd services and script, so it works with directories with sapces in their names.
pull/169/merge
Vitaliy Filippov 2018-07-23 02:46:47 +03:00 committed by GitHub
parent 6b03e244df b47dd70f35
commit 6fe5f0c89b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
systemd/grive-sync.sh
View File

@ -14,16 +14,16 @@ cd ~
### ARGUMENT PARSING ###
SCRIPT=${0}
SCRIPT="${0}"
DIRECTORY=$(systemd-escape --unescape "$2")
if [[ -z ${2} ]] || [[ ! -d ${2} ]] ; then
if [[ -z "$DIRECTORY" ]] || [[ ! -d "$DIRECTORY" ]] ; then
echo "Need a directory name in the current users home directory as second argument. Aborting."
exit 1
fi
DIRECTORY=$2
if [[ -z ${1} ]] ; then
if [[ -z "${1}" ]] ; then
echo "Need a command as first argument. Aborting."
exit 1
else
@ -39,13 +39,13 @@ fi
### LOCKFILE BOILERPLATE ###
LOCKFILE="/run/user/$(id -u)/$(basename $0)_${DIRECTORY//\//_}"
LOCKFILE="/run/user/"$(id -u)"/"$(basename "$0")"_"${DIRECTORY//\//_}""
LOCKFD=99
# PRIVATE
_lock() { flock -$1 $LOCKFD; }
_no_more_locking() { _lock u; _lock xn && rm -f $LOCKFILE; }
_prepare_locking() { eval "exec $LOCKFD>\"$LOCKFILE\""; trap _no_more_locking EXIT; }
_lock() { flock -"$1" "$LOCKFD"; }
_no_more_locking() { _lock u; _lock xn && rm -f "$LOCKFILE"; }
_prepare_locking() { eval "exec "$LOCKFD">\""$LOCKFILE"\""; trap _no_more_locking EXIT; }
# ON START
_prepare_locking
@ -61,7 +61,7 @@ unlock() { _lock u; } # drop a lock
# make sure we sync a second time, too
sync_directory() {
_directory=${1}
_directory="${1}"
if ping -c1 -W1 -q accounts.google.com >/dev/null 2>&1; then
true
# pass
@ -70,18 +70,24 @@ sync_directory() {
exit 0
fi
reset_timer_and_exit() { echo "Retriggered google drive sync" && touch -m $LOCKFILE && exit; }
reset_timer_and_exit() { echo "Retriggered google drive sync" && touch -m "$LOCKFILE" && exit; }
exlock_now || reset_timer_and_exit
TIME_AT_START=0
TIME_AT_END=1
while [[ ${TIME_AT_START} -lt ${TIME_AT_END} ]]; do
echo "Syncing ${_directory}..."
TIME_AT_START=$(stat -c %Y $LOCKFILE)
grive -p ${_directory} 2>&1 | grep -v -E "^Reading local directories$|^Reading remote server file list$|^Synchronizing files$|^Finished!$"
TIME_AT_END=$(stat -c %Y $LOCKFILE)
echo "Sync of ${_directory} done."
while [[ "${TIME_AT_START}" -lt "${TIME_AT_END}" ]]; do
echo "Syncing "${_directory}"..."
TIME_AT_START="$(stat -c %Y "$LOCKFILE")"
# exclude symlinks from sync
cat "${_directory}"/.griveignore 2>/dev/null | sed '/#LINKS-EDIT_BEFORE_THIS$/,$d' > /tmp/.griveignore.base
cp /tmp/.griveignore.base "${_directory}"/.griveignore
rm /tmp/.griveignore.base
echo "#LINKS-EDIT_BEFORE_THIS" >> "${_directory}"/.griveignore
( cd "${_directory}" && find . -type l | sed 's/^.\///g'; ) >> "${_directory}"/.griveignore
grive -p "${_directory}" 2>&1 | grep -v -E "^Reading local directories$|^Reading remote server file list$|^Synchronizing files$|^Finished!$"
TIME_AT_END="$(stat -c %Y "$LOCKFILE")"
echo "Sync of "${_directory}" done."
done
# always exit ok, so that we never go into a wrong systemd state
@ -92,27 +98,28 @@ sync_directory() {
listen_directory() {
_directory=${1}
_directory="${1}"
type inotifywait >/dev/null 2>&1 || { echo >&2 "I require inotifywait but it's not installed. Aborting."; exit 1; }
echo "Listening for changes in ~/${_directory}"
echo "Listening for changes in ~/"${_directory}""
while true #run indefinitely
do
# Use a different call to not need to change exit into return
inotifywait -q -r -e modify,attrib,close_write,move,create,delete --exclude ".grive_state|.grive" ${_directory} > /dev/null 2>&1 && ${SCRIPT} sync ${_directory}
inotifywait -q -r -e modify,attrib,close_write,move,create,delete --exclude ".grive_state|.grive" "${_directory}" > /dev/null 2>&1 && ${SCRIPT} sync "${_directory}"
#echo ${SCRIPT} "${_directory}"
done
# always exit ok, so that we never go into a wrong systemd state
exit 0
}
if [[ ${COMMAND} == listen ]] ; then
listen_directory ${DIRECTORY}
if [[ "${COMMAND}" == listen ]] ; then
listen_directory "${DIRECTORY}"
else
sync_directory ${DIRECTORY}
sync_directory "${DIRECTORY}"
fi
# always exit ok, so that we never go into a wrong systemd state
exit 0
exit 0